diff --git a/Sources/libewol/Android.mk b/Sources/libewol/Android.mk index 6cd1d8ce..51dac5d9 100644 --- a/Sources/libewol/Android.mk +++ b/Sources/libewol/Android.mk @@ -26,7 +26,7 @@ LOCAL_CFLAGS := -Wno-write-strings \ # load the common sources file of the platform include $(LOCAL_PATH)/file.mk -LOCAL_SRC_FILES := ewol/base/gui.Android.cpp $(FILE_LIST) +LOCAL_SRC_FILES := ewol/os/gui.Android.cpp $(FILE_LIST) # Ewol Test Software : LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lz diff --git a/Sources/libewol/Linux.mk b/Sources/libewol/Linux.mk index 609c99b3..eab686fc 100644 --- a/Sources/libewol/Linux.mk +++ b/Sources/libewol/Linux.mk @@ -27,8 +27,8 @@ LOCAL_CFLAGS := -Wno-write-strings \ include $(LOCAL_PATH)/file.mk LOCAL_SRC_FILES := \ - ewol/base/gui.X11.cpp \ - ewol/Audio/interfacePortAudio.cpp \ + ewol/os/gui.X11.cpp \ + ewol/audio/interfacePortAudio.cpp \ $(FILE_LIST) diff --git a/Sources/libewol/Windows.mk b/Sources/libewol/Windows.mk index 8e6f0644..f202db98 100644 --- a/Sources/libewol/Windows.mk +++ b/Sources/libewol/Windows.mk @@ -26,7 +26,7 @@ LOCAL_CFLAGS := -Wno-write-strings \ # load the common sources file of the platform include $(LOCAL_PATH)/file.mk -LOCAL_SRC_FILES := $(FILE_LIST) ewol/base/gui.Windows.cpp +LOCAL_SRC_FILES := $(FILE_LIST) ewol/os/gui.Windows.cpp diff --git a/Sources/libewol/ewol/ClipBoard.cpp b/Sources/libewol/ewol/ClipBoard.cpp index d043be36..cdaeb32d 100644 --- a/Sources/libewol/ewol/ClipBoard.cpp +++ b/Sources/libewol/ewol/ClipBoard.cpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #undef __class__ #define __class__ "ClipBoard" diff --git a/Sources/libewol/ewol/ShortCutManager.cpp b/Sources/libewol/ewol/ShortCutManager.cpp index 0542d21f..788668a1 100644 --- a/Sources/libewol/ewol/ShortCutManager.cpp +++ b/Sources/libewol/ewol/ShortCutManager.cpp @@ -24,7 +24,7 @@ #include -#include +#include #include diff --git a/Sources/libewol/ewol/Audio/audio.cpp b/Sources/libewol/ewol/audio/audio.cpp similarity index 98% rename from Sources/libewol/ewol/Audio/audio.cpp rename to Sources/libewol/ewol/audio/audio.cpp index 2ebf9a36..08323401 100644 --- a/Sources/libewol/ewol/Audio/audio.cpp +++ b/Sources/libewol/ewol/audio/audio.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Audio/audio.c + * @file ewol/audio/audio.c * @brief basic ewol Audio interface (Sources) * @author Edouard DUPIN * @date 02/05/2012 @@ -23,8 +23,8 @@ */ #include -#include -#include +#include +#include #include #include @@ -42,7 +42,7 @@ static int32_t effectsVolumeApply = 1<<16; static bool isInit = false; #ifdef __TARGET_OS__Linux -# include +# include #endif void ewol::audio::Init(void) diff --git a/Sources/libewol/ewol/Audio/audio.h b/Sources/libewol/ewol/audio/audio.h similarity index 98% rename from Sources/libewol/ewol/Audio/audio.h rename to Sources/libewol/ewol/audio/audio.h index ced6c79a..5c55e516 100644 --- a/Sources/libewol/ewol/Audio/audio.h +++ b/Sources/libewol/ewol/audio/audio.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Audio/audio.h + * @file ewol/audio/audio.h * @brief basic ewol Audio interface (header) * @author Edouard DUPIN * @date 02/05/2012 diff --git a/Sources/libewol/ewol/Audio/decWav.cpp b/Sources/libewol/ewol/audio/decWav.cpp similarity index 99% rename from Sources/libewol/ewol/Audio/decWav.cpp rename to Sources/libewol/ewol/audio/decWav.cpp index 4e0d9cf8..00758ff2 100644 --- a/Sources/libewol/ewol/Audio/decWav.cpp +++ b/Sources/libewol/ewol/audio/decWav.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Audio/decWav.cpp + * @file ewol/audio/decWav.cpp * @brief basic ewol Wav decoder (sources) * @author Edouard DUPIN * @date 28/06/2012 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include diff --git a/Sources/libewol/ewol/Audio/decWav.h b/Sources/libewol/ewol/audio/decWav.h similarity index 96% rename from Sources/libewol/ewol/Audio/decWav.h rename to Sources/libewol/ewol/audio/decWav.h index b9d5f74f..1157c6ba 100644 --- a/Sources/libewol/ewol/Audio/decWav.h +++ b/Sources/libewol/ewol/audio/decWav.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Audio/decWav.h + * @file ewol/audio/decWav.h * @brief basic ewol Wav decoder (header) * @author Edouard DUPIN * @date 28/06/2012 diff --git a/Sources/libewol/ewol/Audio/interfacePortAudio.cpp b/Sources/libewol/ewol/audio/interfacePortAudio.cpp similarity index 96% rename from Sources/libewol/ewol/Audio/interfacePortAudio.cpp rename to Sources/libewol/ewol/audio/interfacePortAudio.cpp index 0e2f5b9a..d1eab9d5 100644 --- a/Sources/libewol/ewol/Audio/interfacePortAudio.cpp +++ b/Sources/libewol/ewol/audio/interfacePortAudio.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Audio/intefacePortAudio.cpp + * @file ewol/audio/intefacePortAudio.cpp * @brief poratudio ewol Audio interface (Sources) * @author Edouard DUPIN * @date 28/06/2012 @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/Sources/libewol/ewol/Audio/interfacePortAudio.h b/Sources/libewol/ewol/audio/interfacePortAudio.h similarity index 95% rename from Sources/libewol/ewol/Audio/interfacePortAudio.h rename to Sources/libewol/ewol/audio/interfacePortAudio.h index b0a8965a..e011b502 100644 --- a/Sources/libewol/ewol/Audio/interfacePortAudio.h +++ b/Sources/libewol/ewol/audio/interfacePortAudio.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Audio/intefacePortAudio.h + * @file ewol/audio/intefacePortAudio.h * @brief poratudio ewol Audio interface (header) * @author Edouard DUPIN * @date 28/06/2012 diff --git a/Sources/libewol/ewol/base/gui.MacOs.cpp b/Sources/libewol/ewol/base/gui.MacOs.cpp deleted file mode 100644 index e69de29b..00000000 diff --git a/Sources/libewol/ewol/EObject.cpp b/Sources/libewol/ewol/eObject/EObject.cpp similarity index 99% rename from Sources/libewol/ewol/EObject.cpp rename to Sources/libewol/ewol/eObject/EObject.cpp index edac491e..fb8b0a3a 100644 --- a/Sources/libewol/ewol/EObject.cpp +++ b/Sources/libewol/ewol/eObject/EObject.cpp @@ -22,8 +22,8 @@ ******************************************************************************* */ -#include -#include +#include +#include #include diff --git a/Sources/libewol/ewol/EObject.h b/Sources/libewol/ewol/eObject/EObject.h similarity index 99% rename from Sources/libewol/ewol/EObject.h rename to Sources/libewol/ewol/eObject/EObject.h index f78f0e5a..f6e31a8b 100644 --- a/Sources/libewol/ewol/EObject.h +++ b/Sources/libewol/ewol/eObject/EObject.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/EObject.h + * @file ewol/eObject/EObject.h * @brief basic ewol object (header) * @author Edouard DUPIN * @date 24/02/2012 diff --git a/Sources/libewol/ewol/EObjectManager.cpp b/Sources/libewol/ewol/eObject/EObjectManager.cpp similarity index 96% rename from Sources/libewol/ewol/EObjectManager.cpp rename to Sources/libewol/ewol/eObject/EObjectManager.cpp index 231f662e..ee8d8677 100644 --- a/Sources/libewol/ewol/EObjectManager.cpp +++ b/Sources/libewol/ewol/eObject/EObjectManager.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/EObjectManager.cpp + * @file ewol/eObject/EObjectManager.cpp * @brief basic ewol Object Manager (Sources) * @author Edouard DUPIN * @date 27/02/2012 @@ -22,8 +22,8 @@ ******************************************************************************* */ -#include -#include +#include +#include #undef __class__ #define __class__ "EObjectManager" diff --git a/Sources/libewol/ewol/EObjectManager.h b/Sources/libewol/ewol/eObject/EObjectManager.h similarity index 93% rename from Sources/libewol/ewol/EObjectManager.h rename to Sources/libewol/ewol/eObject/EObjectManager.h index a753bc79..e193c4ca 100644 --- a/Sources/libewol/ewol/EObjectManager.h +++ b/Sources/libewol/ewol/eObject/EObjectManager.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/EObjectManager.h + * @file ewol/eObject/EObjectManager.h * @brief basic ewol Object Manager (Header) * @author Edouard DUPIN * @date 27/02/2012 @@ -27,7 +27,7 @@ #include #include -#include +#include namespace ewol { namespace EObjectManager { diff --git a/Sources/libewol/ewol/ewol.cpp b/Sources/libewol/ewol/ewol.cpp index 03f0c678..68654ee5 100644 --- a/Sources/libewol/ewol/ewol.cpp +++ b/Sources/libewol/ewol/ewol.cpp @@ -24,10 +24,10 @@ #include -#include -#include +#include +#include -#include +#include #undef __class__ #define __class__ "ewol" diff --git a/Sources/libewol/ewol/ewol.h b/Sources/libewol/ewol/ewol.h index b2f2d03d..c06c91bc 100644 --- a/Sources/libewol/ewol/ewol.h +++ b/Sources/libewol/ewol/ewol.h @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #if 1 diff --git a/Sources/libewol/ewol/Font.h b/Sources/libewol/ewol/font/Font.h similarity index 99% rename from Sources/libewol/ewol/Font.h rename to Sources/libewol/ewol/font/Font.h index 8b71382a..0591228c 100644 --- a/Sources/libewol/ewol/Font.h +++ b/Sources/libewol/ewol/font/Font.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Font.h + * @file ewol/font/Font.h * @brief ewol Font system (header) * @author Edouard DUPIN * @date 29/10/2011 diff --git a/Sources/libewol/ewol/FontFreeType.cpp b/Sources/libewol/ewol/font/FontFreeType.cpp similarity index 99% rename from Sources/libewol/ewol/FontFreeType.cpp rename to Sources/libewol/ewol/font/FontFreeType.cpp index dae13251..435a1fcd 100644 --- a/Sources/libewol/ewol/FontFreeType.cpp +++ b/Sources/libewol/ewol/font/FontFreeType.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/FontFreeType.cpp + * @file ewol/font/FontFreeType.cpp * @brief ewol Font system wrapper on freetype(sources) * @author Edouard DUPIN * @date 05/11/2011 @@ -22,8 +22,8 @@ ******************************************************************************* */ -#include -#include +#include +#include #include #include diff --git a/Sources/libewol/ewol/Game/GameElement.cpp b/Sources/libewol/ewol/game/GameElement.cpp similarity index 96% rename from Sources/libewol/ewol/Game/GameElement.cpp rename to Sources/libewol/ewol/game/GameElement.cpp index e94a24c6..ace1edfe 100644 --- a/Sources/libewol/ewol/Game/GameElement.cpp +++ b/Sources/libewol/ewol/game/GameElement.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Game/GameElement.cpp + * @file ewol/game/GameElement.cpp * @brief ewol game element system (Sources) * @author Edouard DUPIN * @date 06/04/2012 @@ -23,7 +23,7 @@ */ -#include +#include #undef __class__ diff --git a/Sources/libewol/ewol/Game/GameElement.h b/Sources/libewol/ewol/game/GameElement.h similarity index 98% rename from Sources/libewol/ewol/Game/GameElement.h rename to Sources/libewol/ewol/game/GameElement.h index 867c3611..5148a229 100644 --- a/Sources/libewol/ewol/Game/GameElement.h +++ b/Sources/libewol/ewol/game/GameElement.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Game/GameElement.h + * @file ewol/game/GameElement.h * @brief ewol game element system (header) * @author Edouard DUPIN * @date 06/04/2012 @@ -27,9 +27,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #define CYCLIC_CALL_PERIODE_US (10000) diff --git a/Sources/libewol/ewol/Game/GameElementLua.cpp b/Sources/libewol/ewol/game/GameElementLua.cpp similarity index 99% rename from Sources/libewol/ewol/Game/GameElementLua.cpp rename to Sources/libewol/ewol/game/GameElementLua.cpp index 127ae60d..aac088f1 100644 --- a/Sources/libewol/ewol/Game/GameElementLua.cpp +++ b/Sources/libewol/ewol/game/GameElementLua.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Game/GameElementLua.cpp + * @file ewol/game/GameElementLua.cpp * @brief ewol game lua element system (Sources) * @author Edouard DUPIN * @date 30/05/2012 @@ -23,7 +23,7 @@ */ -#include +#include /******************************************************************************* ** Lua abstraction (START) diff --git a/Sources/libewol/ewol/Game/GameElementLua.h b/Sources/libewol/ewol/game/GameElementLua.h similarity index 90% rename from Sources/libewol/ewol/Game/GameElementLua.h rename to Sources/libewol/ewol/game/GameElementLua.h index b73c94c1..1ef585f5 100644 --- a/Sources/libewol/ewol/Game/GameElementLua.h +++ b/Sources/libewol/ewol/game/GameElementLua.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Game/GameElementLua.h + * @file ewol/game/GameElementLua.h * @brief ewol game lua element system (header) * @author Edouard DUPIN * @date 30/05/2012 @@ -27,10 +27,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/Sources/libewol/ewol/Game/SceneElement.cpp b/Sources/libewol/ewol/game/SceneElement.cpp similarity index 98% rename from Sources/libewol/ewol/Game/SceneElement.cpp rename to Sources/libewol/ewol/game/SceneElement.cpp index f3e3cd10..aaf6ec51 100644 --- a/Sources/libewol/ewol/Game/SceneElement.cpp +++ b/Sources/libewol/ewol/game/SceneElement.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Game/SceneElement.cpp + * @file ewol/game/SceneElement.cpp * @brief ewol Scene widget system (Sources) * @author Edouard DUPIN * @date 17/04/2012 @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include +#include +#include static uint32_t createUniqueId(uint16_t uniqueID, uint16_t position) { diff --git a/Sources/libewol/ewol/Game/SceneElement.h b/Sources/libewol/ewol/game/SceneElement.h similarity index 98% rename from Sources/libewol/ewol/Game/SceneElement.h rename to Sources/libewol/ewol/game/SceneElement.h index f96397f6..f6a5fcf8 100644 --- a/Sources/libewol/ewol/Game/SceneElement.h +++ b/Sources/libewol/ewol/game/SceneElement.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Game/SceneElement.h + * @file ewol/game/SceneElement.h * @brief ewol Scene widget system (header) * @author Edouard DUPIN * @date 01/04/2012 @@ -27,7 +27,7 @@ #include #include -#include +#include namespace ewol { class GameElement; diff --git a/Sources/libewol/ewol/OObject/2DColored.cpp b/Sources/libewol/ewol/oObject/2DColored.cpp similarity index 99% rename from Sources/libewol/ewol/OObject/2DColored.cpp rename to Sources/libewol/ewol/oObject/2DColored.cpp index b42bfedb..b1d1014c 100644 --- a/Sources/libewol/ewol/OObject/2DColored.cpp +++ b/Sources/libewol/ewol/oObject/2DColored.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/OObject/2DColored.cpp + * @file ewol/oObject/2DColored.cpp * @brief ewol OpenGl Object system (Sources) * @author Edouard DUPIN * @date 09/11/2011 @@ -22,7 +22,7 @@ ******************************************************************************* */ -#include +#include #include #include diff --git a/Sources/libewol/ewol/OObject/2DColored.h b/Sources/libewol/ewol/oObject/2DColored.h similarity index 96% rename from Sources/libewol/ewol/OObject/2DColored.h rename to Sources/libewol/ewol/oObject/2DColored.h index bd67ef0c..7cecd80f 100644 --- a/Sources/libewol/ewol/OObject/2DColored.h +++ b/Sources/libewol/ewol/oObject/2DColored.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/OObject/2DColored.h + * @file ewol/oObject/2DColored.h * @brief ewol OpenGl Object system (header) * @author Edouard DUPIN * @date 09/11/2011 @@ -25,7 +25,7 @@ #ifndef __EWOL_O_OBJECT_2D_COLORED_H__ #define __EWOL_O_OBJECT_2D_COLORED_H__ -#include +#include namespace ewol { class OObject2DColored :public ewol::OObject diff --git a/Sources/libewol/ewol/OObject/2DText.cpp b/Sources/libewol/ewol/oObject/2DText.cpp similarity index 96% rename from Sources/libewol/ewol/OObject/2DText.cpp rename to Sources/libewol/ewol/oObject/2DText.cpp index a331906a..71b20e24 100644 --- a/Sources/libewol/ewol/OObject/2DText.cpp +++ b/Sources/libewol/ewol/oObject/2DText.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/OObject/2DText.cpp + * @file ewol/oObject/2DText.cpp * @brief ewol OpenGl Object system (Sources) * @author Edouard DUPIN * @date 09/11/2011 @@ -22,9 +22,9 @@ ******************************************************************************* */ -#include +#include #include -#include +#include #undef __class__ #define __class__ "ewol::OObject2DText" diff --git a/Sources/libewol/ewol/OObject/2DText.h b/Sources/libewol/ewol/oObject/2DText.h similarity index 96% rename from Sources/libewol/ewol/OObject/2DText.h rename to Sources/libewol/ewol/oObject/2DText.h index 1c5741fc..9ee7dd91 100644 --- a/Sources/libewol/ewol/OObject/2DText.h +++ b/Sources/libewol/ewol/oObject/2DText.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/OObject/2DText.h + * @file ewol/oObject/2DText.h * @brief ewol OpenGl Object system (header) * @author Edouard DUPIN * @date 09/11/2011 @@ -25,7 +25,7 @@ #ifndef __EWOL_O_OBJECT_2D_TEXT_H__ #define __EWOL_O_OBJECT_2D_TEXT_H__ -#include +#include #include namespace ewol { diff --git a/Sources/libewol/ewol/OObject/2DTextColored.cpp b/Sources/libewol/ewol/oObject/2DTextColored.cpp similarity index 97% rename from Sources/libewol/ewol/OObject/2DTextColored.cpp rename to Sources/libewol/ewol/oObject/2DTextColored.cpp index b0acfcc4..511816b8 100644 --- a/Sources/libewol/ewol/OObject/2DTextColored.cpp +++ b/Sources/libewol/ewol/oObject/2DTextColored.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/OObject/2DTextColored.cpp + * @file ewol/oObject/2DTextColored.cpp * @brief ewol OpenGl Object system (Sources) * @author Edouard DUPIN * @date 16/01/2012 @@ -22,9 +22,9 @@ ******************************************************************************* */ -#include +#include #include -#include +#include #undef __class__ #define __class__ "ewol::OObject2DTextColored" diff --git a/Sources/libewol/ewol/OObject/2DTextColored.h b/Sources/libewol/ewol/oObject/2DTextColored.h similarity index 96% rename from Sources/libewol/ewol/OObject/2DTextColored.h rename to Sources/libewol/ewol/oObject/2DTextColored.h index 0b8e244e..5eacdf5e 100644 --- a/Sources/libewol/ewol/OObject/2DTextColored.h +++ b/Sources/libewol/ewol/oObject/2DTextColored.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/OObject/2DTextColored.h + * @file ewol/oObject/2DTextColored.h * @brief ewol OpenGl Object system (header) * @author Edouard DUPIN * @date 16/01/2012 @@ -25,7 +25,7 @@ #ifndef __EWOL_O_OBJECT_2D_TEXT_COLORED_H__ #define __EWOL_O_OBJECT_2D_TEXT_COLORED_H__ -#include +#include namespace ewol { class OObject2DTextColored :public ewol::OObject diff --git a/Sources/libewol/ewol/OObject/2DTextured.cpp b/Sources/libewol/ewol/oObject/2DTextured.cpp similarity index 97% rename from Sources/libewol/ewol/OObject/2DTextured.cpp rename to Sources/libewol/ewol/oObject/2DTextured.cpp index 2e9e53fc..525d95da 100644 --- a/Sources/libewol/ewol/OObject/2DTextured.cpp +++ b/Sources/libewol/ewol/oObject/2DTextured.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/OObject/2DTextured.cpp + * @file ewol/oObject/2DTextured.cpp * @brief ewol OpenGl Object system (Sources) * @author Edouard DUPIN * @date 09/11/2011 @@ -22,8 +22,8 @@ ******************************************************************************* */ -#include -#include +#include +#include #include #undef __class__ diff --git a/Sources/libewol/ewol/OObject/2DTextured.h b/Sources/libewol/ewol/oObject/2DTextured.h similarity index 95% rename from Sources/libewol/ewol/OObject/2DTextured.h rename to Sources/libewol/ewol/oObject/2DTextured.h index de8e4d67..018f1e83 100644 --- a/Sources/libewol/ewol/OObject/2DTextured.h +++ b/Sources/libewol/ewol/oObject/2DTextured.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/OObject/2DTextured.h + * @file ewol/oObject/2DTextured.h * @brief ewol OpenGl Object system (header) * @author Edouard DUPIN * @date 09/11/2011 @@ -25,7 +25,7 @@ #ifndef __EWOL_O_OBJECT_2D_TEXTURED_H__ #define __EWOL_O_OBJECT_2D_TEXTURED_H__ -#include +#include namespace ewol { class OObject2DTextured :public ewol::OObject diff --git a/Sources/libewol/ewol/OObject.cpp b/Sources/libewol/ewol/oObject/OObject.cpp similarity index 93% rename from Sources/libewol/ewol/OObject.cpp rename to Sources/libewol/ewol/oObject/OObject.cpp index 02afcb82..20edfd5e 100644 --- a/Sources/libewol/ewol/OObject.cpp +++ b/Sources/libewol/ewol/oObject/OObject.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/OObject.cpp + * @file ewol/oObject/OObject.cpp * @brief ewol OpenGl Object system (Sources) * @author Edouard DUPIN * @date 24/10/2011 @@ -24,7 +24,7 @@ #include #include -#include +#include #undef __class__ diff --git a/Sources/libewol/ewol/OObject.h b/Sources/libewol/ewol/oObject/OObject.h similarity index 90% rename from Sources/libewol/ewol/OObject.h rename to Sources/libewol/ewol/oObject/OObject.h index a9c497f9..d6c9c1a7 100644 --- a/Sources/libewol/ewol/OObject.h +++ b/Sources/libewol/ewol/oObject/OObject.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/OObject.h + * @file ewol/oObject/OObject.h * @brief ewol OpenGl Object system (header) * @author Edouard DUPIN * @date 24/10/2011 @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include namespace ewol { @@ -71,8 +71,8 @@ namespace ewol { #endif -#include -#include -#include -#include +#include +#include +#include +#include diff --git a/Sources/libewol/ewol/OObject/Sprite.cpp b/Sources/libewol/ewol/oObject/Sprite.cpp similarity index 97% rename from Sources/libewol/ewol/OObject/Sprite.cpp rename to Sources/libewol/ewol/oObject/Sprite.cpp index 2a96710a..ea877269 100644 --- a/Sources/libewol/ewol/OObject/Sprite.cpp +++ b/Sources/libewol/ewol/oObject/Sprite.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/OObject/Sprite.cpp + * @file ewol/oObject/Sprite.cpp * @brief ewol OpenGl Object system (Sources) * @author Edouard DUPIN * @date 04/04/2012 @@ -22,8 +22,8 @@ ******************************************************************************* */ -#include -#include +#include +#include #include #include diff --git a/Sources/libewol/ewol/OObject/Sprite.h b/Sources/libewol/ewol/oObject/Sprite.h similarity index 96% rename from Sources/libewol/ewol/OObject/Sprite.h rename to Sources/libewol/ewol/oObject/Sprite.h index a0c07d87..bb036b1a 100644 --- a/Sources/libewol/ewol/OObject/Sprite.h +++ b/Sources/libewol/ewol/oObject/Sprite.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/OObject/Sprite.h + * @file ewol/oObject/Sprite.h * @brief ewol OpenGl Object system (header) * @author Edouard DUPIN * @date 04/04/2012 @@ -25,7 +25,7 @@ #ifndef __EWOL_O_OBJECT_SPRITE_H__ #define __EWOL_O_OBJECT_SPRITE_H__ -#include +#include namespace ewol { class Sprite :public ewol::OObject diff --git a/Sources/libewol/ewol/base/Fps.h b/Sources/libewol/ewol/os/Fps.h similarity index 99% rename from Sources/libewol/ewol/base/Fps.h rename to Sources/libewol/ewol/os/Fps.h index 00c01654..8bba416f 100644 --- a/Sources/libewol/ewol/base/Fps.h +++ b/Sources/libewol/ewol/os/Fps.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/base/Fps.h + * @file ewol/os/Fps.h * @brief fps counter and displayer (Header) * @author Edouard DUPIN * @date 19/08/2012 diff --git a/Sources/libewol/ewol/base/eSystem.cpp b/Sources/libewol/ewol/os/eSystem.cpp similarity index 98% rename from Sources/libewol/ewol/base/eSystem.cpp rename to Sources/libewol/ewol/os/eSystem.cpp index 3687d326..6ccad624 100644 --- a/Sources/libewol/ewol/base/eSystem.cpp +++ b/Sources/libewol/ewol/os/eSystem.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file MainThread.cpp + * @file os/eSystem.cpp * @brief Main Ewol thread for the abstraction of the OS problematics (Sources) * @author Edouard DUPIN * @date 27/01/2012 @@ -28,16 +28,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include -#include +#include static ewol::Windows* windowsCurrent = NULL; static Vector2D windowsSize(320, 480); diff --git a/Sources/libewol/ewol/base/eSystem.h b/Sources/libewol/ewol/os/eSystem.h similarity index 99% rename from Sources/libewol/ewol/base/eSystem.h rename to Sources/libewol/ewol/os/eSystem.h index a220a890..b947071d 100644 --- a/Sources/libewol/ewol/base/eSystem.h +++ b/Sources/libewol/ewol/os/eSystem.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file eSystem.h + * @file os/eSystem.h * @brief Main Ewol system of management of the input events and drawing request (Header) * @author Edouard DUPIN * @date 27/01/2012 diff --git a/Sources/libewol/ewol/base/eSystemInput.cpp b/Sources/libewol/ewol/os/eSystemInput.cpp similarity index 97% rename from Sources/libewol/ewol/base/eSystemInput.cpp rename to Sources/libewol/ewol/os/eSystemInput.cpp index b752db04..91fcf036 100644 --- a/Sources/libewol/ewol/base/eSystemInput.cpp +++ b/Sources/libewol/ewol/os/eSystemInput.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file eSystemInput.cpp + * @file os/eSystemInput.cpp * @brief Input (mouse,finger) abstraction layer (Sources) * @author Edouard DUPIN * @date 00/04/2011 @@ -25,21 +25,21 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #define EVENT_DEBUG EWOL_VERBOSE @@ -49,7 +49,7 @@ void ewol::eSystemInput::CalculateLimit(void) { m_eventInputLimit.sepatateTime = 300000; // µs m_eventInputLimit.DpiOffset = m_dpi*100; - m_eventMouseLimit.sepatateTime = 30000; // µs + m_eventMouseLimit.sepatateTime = 300000; // µs m_eventMouseLimit.DpiOffset = (float)m_dpi*(float)0.1; } diff --git a/Sources/libewol/ewol/base/eSystemInput.h b/Sources/libewol/ewol/os/eSystemInput.h similarity index 97% rename from Sources/libewol/ewol/base/eSystemInput.h rename to Sources/libewol/ewol/os/eSystemInput.h index 42dc1fbe..6fc0b37c 100644 --- a/Sources/libewol/ewol/base/eSystemInput.h +++ b/Sources/libewol/ewol/os/eSystemInput.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file eSystemInput.h + * @file os/eSystemInput.h * @brief Input (mouse,finger) abstraction layer (header) * @author Edouard DUPIN * @date 00/04/2011 @@ -27,7 +27,7 @@ #ifndef __EWOL_SYSTEM_INPUT_H__ #define __EWOL_SYSTEM_INPUT_H__ -#include +#include namespace ewol { diff --git a/Sources/libewol/ewol/base/gui.Android.cpp b/Sources/libewol/ewol/os/gui.Android.cpp similarity index 97% rename from Sources/libewol/ewol/base/gui.Android.cpp rename to Sources/libewol/ewol/os/gui.Android.cpp index 9b40e330..b40f2286 100644 --- a/Sources/libewol/ewol/base/gui.Android.cpp +++ b/Sources/libewol/ewol/os/gui.Android.cpp @@ -32,13 +32,13 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include -#include +#include #undef __class__ #define __class__ "AndroidJNI" diff --git a/Sources/libewol/ewol/base/gui.Example.cpp b/Sources/libewol/ewol/os/gui.Example.cpp similarity index 100% rename from Sources/libewol/ewol/base/gui.Example.cpp rename to Sources/libewol/ewol/os/gui.Example.cpp diff --git a/Sources/libewol/ewol/base/gui.IOs.cpp b/Sources/libewol/ewol/os/gui.IOs.cpp similarity index 96% rename from Sources/libewol/ewol/base/gui.IOs.cpp rename to Sources/libewol/ewol/os/gui.IOs.cpp index da56f32f..a00d1b93 100644 --- a/Sources/libewol/ewol/base/gui.IOs.cpp +++ b/Sources/libewol/ewol/os/gui.IOs.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file guiIOs.cpp + * @file os/gui.IOs.cpp * @brief Gui abstraction layer for i-OS platform (Sources) * @author Edouard DUPIN * @date 20/10/2011 diff --git a/Sources/libewol/ewol/os/gui.MacOs.cpp b/Sources/libewol/ewol/os/gui.MacOs.cpp new file mode 100644 index 00000000..70c3a2c7 --- /dev/null +++ b/Sources/libewol/ewol/os/gui.MacOs.cpp @@ -0,0 +1,23 @@ +/** + ******************************************************************************* + * @file os/gui.MacOs.cpp + * @brief Gui abstraction layer for Mac-OS platform (Sources) + * @author Edouard DUPIN + * @date 20/08/2012 + * @par Project + * ewol + * + * @par Copyright + * Copyright 2011 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 + * + * Term of the licence in in the file licence.txt. + * + ******************************************************************************* + */ diff --git a/Sources/libewol/ewol/base/gui.Windows.cpp b/Sources/libewol/ewol/os/gui.Windows.cpp similarity index 98% rename from Sources/libewol/ewol/base/gui.Windows.cpp rename to Sources/libewol/ewol/os/gui.Windows.cpp index f854baa9..08639aa5 100644 --- a/Sources/libewol/ewol/base/gui.Windows.cpp +++ b/Sources/libewol/ewol/os/gui.Windows.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file guiWindows.cpp + * @file os/gui.Windows.cpp * @brief Gui abstraction layer for windows (Sources) * @author Edouard DUPIN * @date 20/10/2011 @@ -28,12 +28,12 @@ #include #include #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/Sources/libewol/ewol/base/gui.X11.cpp b/Sources/libewol/ewol/os/gui.X11.cpp similarity index 99% rename from Sources/libewol/ewol/base/gui.X11.cpp rename to Sources/libewol/ewol/os/gui.X11.cpp index 3d69bf63..5a7fbe26 100644 --- a/Sources/libewol/ewol/base/gui.X11.cpp +++ b/Sources/libewol/ewol/os/gui.X11.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file guiX11.cpp + * @file os/gui.X11.cpp * @brief Gui abstraction layer (Sources) * @author Edouard DUPIN * @date 20/10/2011 @@ -27,12 +27,12 @@ #include #include #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/Sources/libewol/ewol/base/gui.h b/Sources/libewol/ewol/os/gui.h similarity index 98% rename from Sources/libewol/ewol/base/gui.h rename to Sources/libewol/ewol/os/gui.h index 6b8a9bc8..88748150 100644 --- a/Sources/libewol/ewol/base/gui.h +++ b/Sources/libewol/ewol/os/gui.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file gui.h + * @file os/gui.h * @brief Gui abstraction layer (header) * @author Edouard DUPIN * @date 20/10/2011 @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/Sources/libewol/ewol/Texture.cpp b/Sources/libewol/ewol/texture/Texture.cpp similarity index 98% rename from Sources/libewol/ewol/Texture.cpp rename to Sources/libewol/ewol/texture/Texture.cpp index 35646afe..55e20330 100644 --- a/Sources/libewol/ewol/Texture.cpp +++ b/Sources/libewol/ewol/texture/Texture.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Texture.cpp + * @file ewol/texture/Texture.cpp * @brief ewol Texture loading system (sources) * @author Edouard DUPIN * @date 28/10/2011 @@ -24,12 +24,12 @@ -#include +#include #include #include -#include -#include -#include +#include +#include +#include //! One Texture element class LoadedTexture diff --git a/Sources/libewol/ewol/Texture.h b/Sources/libewol/ewol/texture/Texture.h similarity index 97% rename from Sources/libewol/ewol/Texture.h rename to Sources/libewol/ewol/texture/Texture.h index c189d3ea..e555b0ce 100644 --- a/Sources/libewol/ewol/Texture.h +++ b/Sources/libewol/ewol/texture/Texture.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Texture.h + * @file ewol/texture/Texture.h * @brief ewol Texture loading system (header) * @author Edouard DUPIN * @date 28/10/2011 diff --git a/Sources/libewol/ewol/Texture/TextureBMP.cpp b/Sources/libewol/ewol/texture/TextureBMP.cpp similarity index 99% rename from Sources/libewol/ewol/Texture/TextureBMP.cpp rename to Sources/libewol/ewol/texture/TextureBMP.cpp index 9632642a..46b4b34c 100644 --- a/Sources/libewol/ewol/Texture/TextureBMP.cpp +++ b/Sources/libewol/ewol/texture/TextureBMP.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Texture/TextureBMP.cpp + * @file ewol/texture/TextureBMP.cpp * @brief ewol Texture Bitmap abstraction (sources) * @author Edouard DUPIN * @date 28/03/2012 @@ -23,7 +23,7 @@ */ -#include +#include #undef __class__ diff --git a/Sources/libewol/ewol/Texture/TextureBMP.h b/Sources/libewol/ewol/texture/TextureBMP.h similarity index 100% rename from Sources/libewol/ewol/Texture/TextureBMP.h rename to Sources/libewol/ewol/texture/TextureBMP.h diff --git a/Sources/libewol/ewol/Texture/TexturePNG.cpp b/Sources/libewol/ewol/texture/TexturePNG.cpp similarity index 100% rename from Sources/libewol/ewol/Texture/TexturePNG.cpp rename to Sources/libewol/ewol/texture/TexturePNG.cpp diff --git a/Sources/libewol/ewol/Texture/TexturePNG.h b/Sources/libewol/ewol/texture/TexturePNG.h similarity index 100% rename from Sources/libewol/ewol/Texture/TexturePNG.h rename to Sources/libewol/ewol/texture/TexturePNG.h diff --git a/Sources/libewol/ewol/Texture/TextureSVG.cpp b/Sources/libewol/ewol/texture/TextureSVG.cpp similarity index 96% rename from Sources/libewol/ewol/Texture/TextureSVG.cpp rename to Sources/libewol/ewol/texture/TextureSVG.cpp index 7788c2b3..30a1a201 100644 --- a/Sources/libewol/ewol/Texture/TextureSVG.cpp +++ b/Sources/libewol/ewol/texture/TextureSVG.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Texture/TextureSVG.cpp + * @file ewol/texture/TextureSVG.cpp * @brief ewol Texture SVG abstraction (Sources) * @author Edouard DUPIN * @date 28/03/2012 @@ -24,7 +24,7 @@ -#include +#include #undef __class__ diff --git a/Sources/libewol/ewol/Texture/TextureSVG.h b/Sources/libewol/ewol/texture/TextureSVG.h similarity index 100% rename from Sources/libewol/ewol/Texture/TextureSVG.h rename to Sources/libewol/ewol/texture/TextureSVG.h diff --git a/Sources/libewol/ewol/widget/Button.cpp b/Sources/libewol/ewol/widget/Button.cpp index b40950e5..a16f7568 100644 --- a/Sources/libewol/ewol/widget/Button.cpp +++ b/Sources/libewol/ewol/widget/Button.cpp @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include extern const char * const ewolEventButtonPressed = "ewol-button-Pressed"; diff --git a/Sources/libewol/ewol/widget/ButtonColor.cpp b/Sources/libewol/ewol/widget/ButtonColor.cpp index c9ed0f71..bd985b09 100644 --- a/Sources/libewol/ewol/widget/ButtonColor.cpp +++ b/Sources/libewol/ewol/widget/ButtonColor.cpp @@ -24,9 +24,9 @@ #include -#include -#include -#include +#include +#include +#include #include diff --git a/Sources/libewol/ewol/widget/ButtonImage.cpp b/Sources/libewol/ewol/widget/ButtonImage.cpp index 10cc1227..fb086cef 100644 --- a/Sources/libewol/ewol/widget/ButtonImage.cpp +++ b/Sources/libewol/ewol/widget/ButtonImage.cpp @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include /** * @brief Initilise the basic widget property ==> due to the android system diff --git a/Sources/libewol/ewol/widget/ButtonImage.h b/Sources/libewol/ewol/widget/ButtonImage.h index 1f8e507b..52342fe7 100644 --- a/Sources/libewol/ewol/widget/ButtonImage.h +++ b/Sources/libewol/ewol/widget/ButtonImage.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include namespace ewol { diff --git a/Sources/libewol/ewol/widget/CheckBox.cpp b/Sources/libewol/ewol/widget/CheckBox.cpp index f3fda4fd..87537412 100644 --- a/Sources/libewol/ewol/widget/CheckBox.cpp +++ b/Sources/libewol/ewol/widget/CheckBox.cpp @@ -25,8 +25,8 @@ #include -#include -#include +#include +#include extern const char * const ewolEventCheckBoxClicked = "ewol CheckBox Clicked"; diff --git a/Sources/libewol/ewol/widget/ColorBar.cpp b/Sources/libewol/ewol/widget/ColorBar.cpp index e389b1e3..ed4bc02c 100644 --- a/Sources/libewol/ewol/widget/ColorBar.cpp +++ b/Sources/libewol/ewol/widget/ColorBar.cpp @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include #include diff --git a/Sources/libewol/ewol/widget/ContextMenu.cpp b/Sources/libewol/ewol/widget/ContextMenu.cpp index f1529f23..822eecb0 100644 --- a/Sources/libewol/ewol/widget/ContextMenu.cpp +++ b/Sources/libewol/ewol/widget/ContextMenu.cpp @@ -25,7 +25,7 @@ #include -#include +#include #include #undef __class__ diff --git a/Sources/libewol/ewol/widget/ContextMenu.h b/Sources/libewol/ewol/widget/ContextMenu.h index b7a5ce9c..1c9b7970 100644 --- a/Sources/libewol/ewol/widget/ContextMenu.h +++ b/Sources/libewol/ewol/widget/ContextMenu.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include namespace ewol { diff --git a/Sources/libewol/ewol/widget/Drawable.h b/Sources/libewol/ewol/widget/Drawable.h index 3c5950d7..59a68c0a 100644 --- a/Sources/libewol/ewol/widget/Drawable.h +++ b/Sources/libewol/ewol/widget/Drawable.h @@ -25,7 +25,7 @@ #ifndef __EWOL_WIDGET_DRAWABLE_H__ #define __EWOL_WIDGET_DRAWABLE_H__ -#include +#include namespace ewol { diff --git a/Sources/libewol/ewol/widget/Entry.cpp b/Sources/libewol/ewol/widget/Entry.cpp index 72fbe6c4..f6aceefc 100644 --- a/Sources/libewol/ewol/widget/Entry.cpp +++ b/Sources/libewol/ewol/widget/Entry.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/Sources/libewol/ewol/widget/Image.cpp b/Sources/libewol/ewol/widget/Image.cpp index 8d724376..26d21d33 100644 --- a/Sources/libewol/ewol/widget/Image.cpp +++ b/Sources/libewol/ewol/widget/Image.cpp @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include extern const char * const ewolEventImagePressed = "ewol-image-Pressed"; diff --git a/Sources/libewol/ewol/widget/Joystick.cpp b/Sources/libewol/ewol/widget/Joystick.cpp index cad9b4cf..bf8c38b3 100644 --- a/Sources/libewol/ewol/widget/Joystick.cpp +++ b/Sources/libewol/ewol/widget/Joystick.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include extern const char * const ewolEventJoystickEnable = "ewol-joystick-enable"; extern const char * const ewolEventJoystickDisable = "ewol-joystick-disable"; diff --git a/Sources/libewol/ewol/widget/Label.cpp b/Sources/libewol/ewol/widget/Label.cpp index fe749768..ece82024 100644 --- a/Sources/libewol/ewol/widget/Label.cpp +++ b/Sources/libewol/ewol/widget/Label.cpp @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include extern const char * const ewolEventLabelPressed = "ewol Label Pressed"; diff --git a/Sources/libewol/ewol/widget/Layer.cpp b/Sources/libewol/ewol/widget/Layer.cpp index 92250b4f..caf5476d 100644 --- a/Sources/libewol/ewol/widget/Layer.cpp +++ b/Sources/libewol/ewol/widget/Layer.cpp @@ -24,7 +24,7 @@ #include -#include +#include #undef __class__ diff --git a/Sources/libewol/ewol/widget/Layer.h b/Sources/libewol/ewol/widget/Layer.h index 59b26566..ebd788e1 100644 --- a/Sources/libewol/ewol/widget/Layer.h +++ b/Sources/libewol/ewol/widget/Layer.h @@ -27,7 +27,7 @@ #include #include -#include +#include namespace ewol { class Layer :public ewol::Widget diff --git a/Sources/libewol/ewol/widget/List.cpp b/Sources/libewol/ewol/widget/List.cpp index a4c760fd..15625346 100644 --- a/Sources/libewol/ewol/widget/List.cpp +++ b/Sources/libewol/ewol/widget/List.cpp @@ -25,8 +25,8 @@ #include -#include -#include +#include +#include #undef __class__ #define __class__ "List" diff --git a/Sources/libewol/ewol/widget/Menu.cpp b/Sources/libewol/ewol/widget/Menu.cpp index 11b2bf8a..42e0e587 100644 --- a/Sources/libewol/ewol/widget/Menu.cpp +++ b/Sources/libewol/ewol/widget/Menu.cpp @@ -25,8 +25,8 @@ #include -#include -#include +#include +#include #include #include #include diff --git a/Sources/libewol/ewol/widget/Menu.h b/Sources/libewol/ewol/widget/Menu.h index 973e8d9f..f76a1fd4 100644 --- a/Sources/libewol/ewol/widget/Menu.h +++ b/Sources/libewol/ewol/widget/Menu.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/Sources/libewol/ewol/widget/PopUp.cpp b/Sources/libewol/ewol/widget/PopUp.cpp index dd8b8309..395bc80e 100644 --- a/Sources/libewol/ewol/widget/PopUp.cpp +++ b/Sources/libewol/ewol/widget/PopUp.cpp @@ -25,7 +25,7 @@ #include -#include +#include #undef __class__ #define __class__ "PopUp" diff --git a/Sources/libewol/ewol/widget/PopUp.h b/Sources/libewol/ewol/widget/PopUp.h index eb67c403..2956236c 100644 --- a/Sources/libewol/ewol/widget/PopUp.h +++ b/Sources/libewol/ewol/widget/PopUp.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include namespace ewol { diff --git a/Sources/libewol/ewol/widget/ProgressBar.cpp b/Sources/libewol/ewol/widget/ProgressBar.cpp index 39247091..86e17487 100644 --- a/Sources/libewol/ewol/widget/ProgressBar.cpp +++ b/Sources/libewol/ewol/widget/ProgressBar.cpp @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include #undef __class__ #define __class__ "Slider" diff --git a/Sources/libewol/ewol/widget/Scene.cpp b/Sources/libewol/ewol/widget/Scene.cpp index 876d0b63..0b86f078 100644 --- a/Sources/libewol/ewol/widget/Scene.cpp +++ b/Sources/libewol/ewol/widget/Scene.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include /** diff --git a/Sources/libewol/ewol/widget/Scene.h b/Sources/libewol/ewol/widget/Scene.h index cdf27a86..4b3506ac 100644 --- a/Sources/libewol/ewol/widget/Scene.h +++ b/Sources/libewol/ewol/widget/Scene.h @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include namespace ewol { diff --git a/Sources/libewol/ewol/widget/SizerHori.cpp b/Sources/libewol/ewol/widget/SizerHori.cpp index 48b0886f..83c000ad 100644 --- a/Sources/libewol/ewol/widget/SizerHori.cpp +++ b/Sources/libewol/ewol/widget/SizerHori.cpp @@ -25,7 +25,7 @@ #include -#include +#include #undef __class__ #define __class__ "SizerHori" diff --git a/Sources/libewol/ewol/widget/SizerHori.h b/Sources/libewol/ewol/widget/SizerHori.h index 0ce962dc..78012c4c 100644 --- a/Sources/libewol/ewol/widget/SizerHori.h +++ b/Sources/libewol/ewol/widget/SizerHori.h @@ -27,7 +27,7 @@ #include #include -#include +#include namespace ewol { class SizerHori :public ewol::Widget diff --git a/Sources/libewol/ewol/widget/SizerVert.cpp b/Sources/libewol/ewol/widget/SizerVert.cpp index 7340f946..c6d6a8bd 100644 --- a/Sources/libewol/ewol/widget/SizerVert.cpp +++ b/Sources/libewol/ewol/widget/SizerVert.cpp @@ -24,7 +24,7 @@ #include -#include +#include #undef __class__ diff --git a/Sources/libewol/ewol/widget/SizerVert.h b/Sources/libewol/ewol/widget/SizerVert.h index 2d3bb934..8fb0354b 100644 --- a/Sources/libewol/ewol/widget/SizerVert.h +++ b/Sources/libewol/ewol/widget/SizerVert.h @@ -27,7 +27,7 @@ #include #include -#include +#include namespace ewol { class SizerVert :public ewol::Widget diff --git a/Sources/libewol/ewol/widget/Slider.cpp b/Sources/libewol/ewol/widget/Slider.cpp index a44554f2..39922bf6 100644 --- a/Sources/libewol/ewol/widget/Slider.cpp +++ b/Sources/libewol/ewol/widget/Slider.cpp @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include extern const char * const ewolEventSliderChange = "ewol-event-slider-change"; diff --git a/Sources/libewol/ewol/widget/Spacer.cpp b/Sources/libewol/ewol/widget/Spacer.cpp index 98d03caf..b5549753 100644 --- a/Sources/libewol/ewol/widget/Spacer.cpp +++ b/Sources/libewol/ewol/widget/Spacer.cpp @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include #undef __class__ diff --git a/Sources/libewol/ewol/widget/WSlider.cpp b/Sources/libewol/ewol/widget/WSlider.cpp index 909e189b..06e348a6 100644 --- a/Sources/libewol/ewol/widget/WSlider.cpp +++ b/Sources/libewol/ewol/widget/WSlider.cpp @@ -24,7 +24,7 @@ #include -#include +#include #include diff --git a/Sources/libewol/ewol/widget/WSlider.h b/Sources/libewol/ewol/widget/WSlider.h index cbe711e1..5914d8c4 100644 --- a/Sources/libewol/ewol/widget/WSlider.h +++ b/Sources/libewol/ewol/widget/WSlider.h @@ -27,7 +27,7 @@ #include #include -#include +#include namespace ewol { class WSlider :public ewol::Widget diff --git a/Sources/libewol/ewol/Widget.cpp b/Sources/libewol/ewol/widget/Widget.cpp similarity index 98% rename from Sources/libewol/ewol/Widget.cpp rename to Sources/libewol/ewol/widget/Widget.cpp index 6e3bffec..cf11bcd9 100644 --- a/Sources/libewol/ewol/Widget.cpp +++ b/Sources/libewol/ewol/widget/Widget.cpp @@ -22,9 +22,9 @@ ******************************************************************************* */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/Sources/libewol/ewol/Widget.h b/Sources/libewol/ewol/widget/Widget.h similarity index 99% rename from Sources/libewol/ewol/Widget.h rename to Sources/libewol/ewol/widget/Widget.h index 4d614cc8..3f433cb6 100644 --- a/Sources/libewol/ewol/Widget.h +++ b/Sources/libewol/ewol/widget/Widget.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/Widget.h + * @file ewol/widget/Widget.h * @brief basic ewol Widget (header) * @author Edouard DUPIN * @date 18/10/2011 @@ -25,7 +25,7 @@ #ifndef __EWOL_WIDGET_H__ #define __EWOL_WIDGET_H__ -#include +#include namespace ewol { class Widget; @@ -33,7 +33,7 @@ namespace ewol { #include #include #include -#include +#include #include namespace ewol { diff --git a/Sources/libewol/ewol/WidgetManager.cpp b/Sources/libewol/ewol/widget/WidgetManager.cpp similarity index 99% rename from Sources/libewol/ewol/WidgetManager.cpp rename to Sources/libewol/ewol/widget/WidgetManager.cpp index edfb19ee..8d4c024a 100644 --- a/Sources/libewol/ewol/WidgetManager.cpp +++ b/Sources/libewol/ewol/widget/WidgetManager.cpp @@ -22,7 +22,7 @@ ******************************************************************************* */ -#include +#include #include #include #include diff --git a/Sources/libewol/ewol/WidgetManager.h b/Sources/libewol/ewol/widget/WidgetManager.h similarity index 94% rename from Sources/libewol/ewol/WidgetManager.h rename to Sources/libewol/ewol/widget/WidgetManager.h index 866963d5..00096001 100644 --- a/Sources/libewol/ewol/WidgetManager.h +++ b/Sources/libewol/ewol/widget/WidgetManager.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/WidgetManager.h + * @file ewol/widget/WidgetManager.h * @brief basic ewol Widget Manager (Header) * @author Edouard DUPIN * @date 13/11/2011 @@ -27,9 +27,9 @@ #include #include -#include +#include #include -#include +#include namespace ewol { namespace widgetManager { diff --git a/Sources/libewol/ewol/widget/WidgetScrolled.cpp b/Sources/libewol/ewol/widget/WidgetScrolled.cpp index 82b19ee1..0c386150 100644 --- a/Sources/libewol/ewol/widget/WidgetScrolled.cpp +++ b/Sources/libewol/ewol/widget/WidgetScrolled.cpp @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/Sources/libewol/ewol/widget/WidgetScrolled.h b/Sources/libewol/ewol/widget/WidgetScrolled.h index 00ebfd28..ec184df5 100644 --- a/Sources/libewol/ewol/widget/WidgetScrolled.h +++ b/Sources/libewol/ewol/widget/WidgetScrolled.h @@ -27,7 +27,7 @@ #include #include -#include +#include namespace ewol { typedef enum { diff --git a/Sources/libewol/ewol/Windows.cpp b/Sources/libewol/ewol/widget/Windows.cpp similarity index 96% rename from Sources/libewol/ewol/Windows.cpp rename to Sources/libewol/ewol/widget/Windows.cpp index 156e91d7..c964e0f8 100644 --- a/Sources/libewol/ewol/Windows.cpp +++ b/Sources/libewol/ewol/widget/Windows.cpp @@ -24,15 +24,15 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include -#include +#include +#include diff --git a/Sources/libewol/ewol/Windows.h b/Sources/libewol/ewol/widget/Windows.h similarity index 98% rename from Sources/libewol/ewol/Windows.h rename to Sources/libewol/ewol/widget/Windows.h index aee9ee85..13f3412a 100644 --- a/Sources/libewol/ewol/Windows.h +++ b/Sources/libewol/ewol/widget/Windows.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include namespace ewol { diff --git a/Sources/libewol/ewol/widgetMeta/ColorChooser.cpp b/Sources/libewol/ewol/widget/meta/ColorChooser.cpp similarity index 98% rename from Sources/libewol/ewol/widgetMeta/ColorChooser.cpp rename to Sources/libewol/ewol/widget/meta/ColorChooser.cpp index 5c90fcc1..7c849a17 100644 --- a/Sources/libewol/ewol/widgetMeta/ColorChooser.cpp +++ b/Sources/libewol/ewol/widget/meta/ColorChooser.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/widgetMeta/ColorChooser.cpp + * @file ewol/widget/meta/ColorChooser.cpp * @brief ewol Color chooser meta widget system (Sources) * @author Edouard DUPIN * @date 05/03/2012 @@ -22,12 +22,12 @@ ******************************************************************************* */ -#include +#include #include #include #include #include -#include +#include //#include #include diff --git a/Sources/libewol/ewol/widgetMeta/ColorChooser.h b/Sources/libewol/ewol/widget/meta/ColorChooser.h similarity index 98% rename from Sources/libewol/ewol/widgetMeta/ColorChooser.h rename to Sources/libewol/ewol/widget/meta/ColorChooser.h index 8ab13ce9..5c1034c0 100644 --- a/Sources/libewol/ewol/widgetMeta/ColorChooser.h +++ b/Sources/libewol/ewol/widget/meta/ColorChooser.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/widgetMeta/ColorChooser.h + * @file ewol/widget/meta/ColorChooser.h * @brief ewol Color chooser meta widget system (header) * @author Edouard DUPIN * @date 05/03/2012 diff --git a/Sources/libewol/ewol/widgetMeta/FileChooser.cpp b/Sources/libewol/ewol/widget/meta/FileChooser.cpp similarity index 99% rename from Sources/libewol/ewol/widgetMeta/FileChooser.cpp rename to Sources/libewol/ewol/widget/meta/FileChooser.cpp index a849f306..ac836626 100644 --- a/Sources/libewol/ewol/widgetMeta/FileChooser.cpp +++ b/Sources/libewol/ewol/widget/meta/FileChooser.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/widgetMeta/FileChooser.cpp + * @file ewol/widget/meta/FileChooser.cpp * @brief ewol File chooser meta widget system (Sources) * @author Edouard DUPIN * @date 29/12/2011 @@ -22,13 +22,13 @@ ******************************************************************************* */ -#include +#include #include #include #include #include #include -#include +#include //#include #include diff --git a/Sources/libewol/ewol/widgetMeta/FileChooser.h b/Sources/libewol/ewol/widget/meta/FileChooser.h similarity index 98% rename from Sources/libewol/ewol/widgetMeta/FileChooser.h rename to Sources/libewol/ewol/widget/meta/FileChooser.h index 6e11436d..9d4d965b 100644 --- a/Sources/libewol/ewol/widgetMeta/FileChooser.h +++ b/Sources/libewol/ewol/widget/meta/FileChooser.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/widgetMeta/FileChooser.h + * @file ewol/widget/meta/FileChooser.h * @brief ewol File chooser meta widget system (header) * @author Edouard DUPIN * @date 29/12/2011 diff --git a/Sources/libewol/ewol/widgetMeta/Parameter.cpp b/Sources/libewol/ewol/widget/meta/Parameter.cpp similarity index 98% rename from Sources/libewol/ewol/widgetMeta/Parameter.cpp rename to Sources/libewol/ewol/widget/meta/Parameter.cpp index 63e18368..13d68680 100644 --- a/Sources/libewol/ewol/widgetMeta/Parameter.cpp +++ b/Sources/libewol/ewol/widget/meta/Parameter.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/widgetMeta/FileChooser.cpp + * @file ewol/widget/meta/FileChooser.cpp * @brief ewol File chooser meta widget system (Sources) * @author Edouard DUPIN * @date 29/12/2011 @@ -22,13 +22,13 @@ ******************************************************************************* */ -#include +#include #include #include #include #include #include -#include +#include #include diff --git a/Sources/libewol/ewol/widgetMeta/Parameter.h b/Sources/libewol/ewol/widget/meta/Parameter.h similarity index 97% rename from Sources/libewol/ewol/widgetMeta/Parameter.h rename to Sources/libewol/ewol/widget/meta/Parameter.h index 6480910b..4a2eed85 100644 --- a/Sources/libewol/ewol/widgetMeta/Parameter.h +++ b/Sources/libewol/ewol/widget/meta/Parameter.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/widgetMeta/FileChooser.h + * @file ewol/widget/meta/FileChooser.h * @brief ewol File chooser meta widget system (header) * @author Edouard DUPIN * @date 29/12/2011 @@ -34,7 +34,7 @@ #include #include #include -#include +#include extern const char * const ewolEventParameterClose; diff --git a/Sources/libewol/ewol/widgetMeta/ParameterList.cpp b/Sources/libewol/ewol/widget/meta/ParameterList.cpp similarity index 98% rename from Sources/libewol/ewol/widgetMeta/ParameterList.cpp rename to Sources/libewol/ewol/widget/meta/ParameterList.cpp index 87e13b21..47cda0ce 100644 --- a/Sources/libewol/ewol/widgetMeta/ParameterList.cpp +++ b/Sources/libewol/ewol/widget/meta/ParameterList.cpp @@ -22,7 +22,7 @@ ******************************************************************************* */ -#include +#include #include @@ -33,8 +33,8 @@ extern const char * const ewolEventParameterListSelect = "ewol-event-paramet #include -#include -#include +#include +#include #undef __class__ #define __class__ "List" diff --git a/Sources/libewol/ewol/widgetMeta/ParameterList.h b/Sources/libewol/ewol/widget/meta/ParameterList.h similarity index 100% rename from Sources/libewol/ewol/widgetMeta/ParameterList.h rename to Sources/libewol/ewol/widget/meta/ParameterList.h diff --git a/Sources/libewol/ewol/widgetMeta/StdPopUp.cpp b/Sources/libewol/ewol/widget/meta/StdPopUp.cpp similarity index 97% rename from Sources/libewol/ewol/widgetMeta/StdPopUp.cpp rename to Sources/libewol/ewol/widget/meta/StdPopUp.cpp index 7f4b33f1..7279a5d8 100644 --- a/Sources/libewol/ewol/widgetMeta/StdPopUp.cpp +++ b/Sources/libewol/ewol/widget/meta/StdPopUp.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/widgetMeta/StdPopUP.cpp + * @file ewol/widget/meta/StdPopUP.cpp * @brief ewol standard pop-up widget system (Sources) * @author Edouard DUPIN * @date 01/01/2012 @@ -22,13 +22,13 @@ ******************************************************************************* */ -#include +#include #include #include #include #include #include -#include +#include #include diff --git a/Sources/libewol/ewol/widgetMeta/StdPopUp.h b/Sources/libewol/ewol/widget/meta/StdPopUp.h similarity index 98% rename from Sources/libewol/ewol/widgetMeta/StdPopUp.h rename to Sources/libewol/ewol/widget/meta/StdPopUp.h index 5c62a38a..d5d40bde 100644 --- a/Sources/libewol/ewol/widgetMeta/StdPopUp.h +++ b/Sources/libewol/ewol/widget/meta/StdPopUp.h @@ -1,6 +1,6 @@ /** ******************************************************************************* - * @file ewol/widgetMeta/StdPopUP.ch + * @file ewol/widget/meta/StdPopUP.ch * @brief ewol standard pop-up widget system (Header) * @author Edouard DUPIN * @date 01/01/2012 diff --git a/Sources/libewol/file.mk b/Sources/libewol/file.mk index fe16bfc5..a2a13755 100644 --- a/Sources/libewol/file.mk +++ b/Sources/libewol/file.mk @@ -1,32 +1,46 @@ - +# Basic elements FILE_LIST = ewol/ewol.cpp \ ewol/threadMsg.cpp \ ewol/openGl.cpp \ - ewol/base/eSystem.cpp \ - ewol/base/eSystemInput.cpp \ ewol/ClipBoard.cpp \ ewol/Debug.cpp \ - ewol/EObject.cpp \ - ewol/EObjectManager.cpp \ - ewol/OObject.cpp \ - ewol/Game/GameElement.cpp \ - ewol/Game/GameElementLua.cpp \ - ewol/Game/SceneElement.cpp \ - ewol/OObject/2DText.cpp \ - ewol/OObject/2DTextColored.cpp \ - ewol/OObject/2DColored.cpp \ - ewol/OObject/2DTextured.cpp \ - ewol/OObject/Sprite.cpp \ - ewol/Texture.cpp \ - ewol/Texture/TextureBMP.cpp \ - ewol/Texture/TexturePNG.cpp \ - ewol/Texture/TextureSVG.cpp \ - ewol/FontFreeType.cpp \ - ewol/Widget.cpp \ - ewol/WidgetManager.cpp \ - ewol/Windows.cpp \ - ewol/ShortCutManager.cpp \ + ewol/ShortCutManager.cpp + +# Gui interface +FILE_LIST+= ewol/os/eSystem.cpp \ + ewol/os/eSystemInput.cpp + +# Basic Eobject of EWOL +FILE_LIST+= ewol/eObject/EObject.cpp \ + ewol/eObject/EObjectManager.cpp + +# Game elements +FILE_LIST+= ewol/game/GameElement.cpp \ + ewol/game/GameElementLua.cpp \ + ewol/game/SceneElement.cpp + +# Object abstraction for OpenGl +FILE_LIST+= ewol/oObject/OObject.cpp \ + ewol/oObject/2DText.cpp \ + ewol/oObject/2DTextColored.cpp \ + ewol/oObject/2DColored.cpp \ + ewol/oObject/2DTextured.cpp \ + ewol/oObject/Sprite.cpp + +# texture management +FILE_LIST+= ewol/texture/Texture.cpp \ + ewol/texture/TextureBMP.cpp \ + ewol/texture/TexturePNG.cpp \ + ewol/texture/TextureSVG.cpp + +# fonst system +FILE_LIST+= ewol/font/FontFreeType.cpp + +# all widgets +FILE_LIST+= ewol/widget/Widget.cpp \ + ewol/widget/WidgetManager.cpp \ + ewol/widget/Windows.cpp \ ewol/widget/Button.cpp \ ewol/widget/ButtonImage.cpp \ ewol/widget/Image.cpp \ @@ -51,12 +65,16 @@ FILE_LIST = ewol/ewol.cpp \ ewol/widget/WSlider.cpp \ ewol/widget/Spacer.cpp \ ewol/widget/WidgetScrolled.cpp \ - ewol/widgetMeta/FileChooser.cpp \ - ewol/widgetMeta/ColorChooser.cpp \ - ewol/widgetMeta/Parameter.cpp \ - ewol/widgetMeta/ParameterList.cpp \ - ewol/theme/Theme.cpp \ - ewol/Audio/audio.cpp \ - ewol/Audio/decWav.cpp + ewol/widget/meta/FileChooser.cpp \ + ewol/widget/meta/ColorChooser.cpp \ + ewol/widget/meta/Parameter.cpp \ + ewol/widget/meta/ParameterList.cpp + +# Theme parsing ... +FILE_LIST+= ewol/theme/Theme.cpp + +# Audio system +FILE_LIST+= ewol/audio/audio.cpp \ + ewol/audio/decWav.cpp