atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] add correct stdPopUp and start integration of documantation

Browse Source
This commit is contained in:
Edouard DUPIN 2013-11-08 22:31:45 +01:00
parent f73a5b80c4
commit 2235522951
11 changed files with 268 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
doxygen.dox
View File

@ -4,7 +4,7 @@
# Project related configuration options # Project related configuration options
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8 DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = "EWOL/ETK: " PROJECT_NAME = "EWOL"
PROJECT_NUMBER = PROJECT_NUMBER =
OUTPUT_DIRECTORY = "doxygen/" OUTPUT_DIRECTORY = "doxygen/"
CREATE_SUBDIRS = YES CREATE_SUBDIRS = YES
@ -18,7 +18,7 @@ FULL_PATH_NAMES = NO
STRIP_FROM_PATH = STRIP_FROM_PATH =
STRIP_FROM_INC_PATH = STRIP_FROM_INC_PATH =
SHORT_NAMES = NO SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = NO JAVADOC_AUTOBRIEF = YES
QT_AUTOBRIEF = NO QT_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO MULTILINE_CPP_IS_BRIEF = NO
INHERIT_DOCS = YES INHERIT_DOCS = YES
@ -29,24 +29,21 @@ OPTIMIZE_OUTPUT_FOR_C = YES
OPTIMIZE_OUTPUT_JAVA = NO OPTIMIZE_OUTPUT_JAVA = NO
OPTIMIZE_FOR_FORTRAN = NO OPTIMIZE_FOR_FORTRAN = NO
OPTIMIZE_OUTPUT_VHDL = NO OPTIMIZE_OUTPUT_VHDL = NO
EXTENSION_MAPPING =
BUILTIN_STL_SUPPORT = NO BUILTIN_STL_SUPPORT = NO
CPP_CLI_SUPPORT = NO CPP_CLI_SUPPORT = NO
SIP_SUPPORT = NO SIP_SUPPORT = NO
IDL_PROPERTY_SUPPORT = YES IDL_PROPERTY_SUPPORT = YES
DISTRIBUTE_GROUP_DOC = NO
SUBGROUPING = YES SUBGROUPING = YES
TYPEDEF_HIDES_STRUCT = NO TYPEDEF_HIDES_STRUCT = YES
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Build related configuration options # Build related configuration options
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
SYMBOL_CACHE_SIZE = 0
EXTRACT_ALL = YES EXTRACT_ALL = YES
EXTRACT_PRIVATE = YES EXTRACT_PRIVATE = NO
EXTRACT_STATIC = YES EXTRACT_STATIC = YES
EXTRACT_LOCAL_CLASSES = YES EXTRACT_LOCAL_CLASSES = NO
EXTRACT_LOCAL_METHODS = YES EXTRACT_LOCAL_METHODS = NO
EXTRACT_ANON_NSPACES = YES EXTRACT_ANON_NSPACES = NO
HIDE_UNDOC_MEMBERS = NO HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO HIDE_UNDOC_CLASSES = NO
HIDE_FRIEND_COMPOUNDS = NO HIDE_FRIEND_COMPOUNDS = NO
@ -54,22 +51,21 @@ HIDE_IN_BODY_DOCS = NO
INTERNAL_DOCS = YES INTERNAL_DOCS = YES
CASE_SENSE_NAMES = YES CASE_SENSE_NAMES = YES
HIDE_SCOPE_NAMES = NO HIDE_SCOPE_NAMES = NO
SHOW_INCLUDE_FILES = YES SHOW_INCLUDE_FILES = NO
INLINE_INFO = YES INLINE_INFO = YES
SORT_MEMBER_DOCS = YES SORT_MEMBER_DOCS = YES
SORT_BRIEF_DOCS = NO SORT_BRIEF_DOCS = NO
SORT_MEMBERS_CTORS_1ST = NO
SORT_GROUP_NAMES = NO SORT_GROUP_NAMES = NO
SORT_BY_SCOPE_NAME = NO SORT_BY_SCOPE_NAME = NO
GENERATE_TODOLIST = YES GENERATE_TODOLIST = NO
GENERATE_TESTLIST = YES GENERATE_TESTLIST = NO
GENERATE_BUGLIST = YES GENERATE_BUGLIST = NO
GENERATE_DEPRECATEDLIST= YES GENERATE_DEPRECATEDLIST= YES
ENABLED_SECTIONS = ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30 MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES SHOW_USED_FILES = NO
SHOW_DIRECTORIES = NO SHOW_DIRECTORIES = NO
SHOW_FILES = YES SHOW_FILES = NO
SHOW_NAMESPACES = YES SHOW_NAMESPACES = YES
FILE_VERSION_FILTER = FILE_VERSION_FILTER =
LAYOUT_FILE = LAYOUT_FILE =
@ -86,7 +82,13 @@ WARN_LOGFILE = "doxygen.log"
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# configuration options related to the input files # configuration options related to the input files
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
INPUT = sources external/etk external/parsersvg INPUT = sources \
external/egami \
external/ege \
external/ejson \
external/esvg \
external/etk \
external/exml
INPUT_ENCODING = UTF-8 INPUT_ENCODING = UTF-8
FILE_PATTERNS = *.c \ FILE_PATTERNS = *.c \
*.cpp \ *.cpp \
@ -111,7 +113,7 @@ INLINE_SOURCES = NO
STRIP_CODE_COMMENTS = YES STRIP_CODE_COMMENTS = YES
REFERENCED_BY_RELATION = NO REFERENCED_BY_RELATION = NO
REFERENCES_RELATION = NO REFERENCES_RELATION = NO
REFERENCES_LINK_SOURCE = YES REFERENCES_LINK_SOURCE = NO
USE_HTAGS = NO USE_HTAGS = NO
VERBATIM_HEADERS = NO VERBATIM_HEADERS = NO
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
@ -211,14 +213,14 @@ PERLMOD_MAKEVAR_PREFIX =
# Configuration options related to the preprocessor # Configuration options related to the preprocessor
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
ENABLE_PREPROCESSING = YES ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES MACRO_EXPANSION = NO
EXPAND_ONLY_PREDEF = YES EXPAND_ONLY_PREDEF = NO
SEARCH_INCLUDES = YES SEARCH_INCLUDES = YES
INCLUDE_PATH = INCLUDE_PATH =
INCLUDE_FILE_PATTERNS = INCLUDE_FILE_PATTERNS =
PREDEFINED = PREDEFINED =
EXPAND_AS_DEFINED = EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = NO SKIP_FUNCTION_MACROS = YES
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Configuration::additions related to external references # Configuration::additions related to external references
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
@ -233,20 +235,20 @@ PERL_PATH = /usr/bin/perl
CLASS_DIAGRAMS = YES CLASS_DIAGRAMS = YES
MSCGEN_PATH = MSCGEN_PATH =
HIDE_UNDOC_RELATIONS = YES HIDE_UNDOC_RELATIONS = YES
HAVE_DOT = YES HAVE_DOT = NO
DOT_FONTNAME = FreeSans DOT_FONTNAME = FreeSans
DOT_FONTSIZE = 10 DOT_FONTSIZE = 10
DOT_FONTPATH = DOT_FONTPATH =
CLASS_GRAPH = YES CLASS_GRAPH = YES
COLLABORATION_GRAPH = YES COLLABORATION_GRAPH = NO
GROUP_GRAPHS = YES GROUP_GRAPHS = NO
UML_LOOK = YES UML_LOOK = NO
TEMPLATE_RELATIONS = YES TEMPLATE_RELATIONS = NO
INCLUDE_GRAPH = YES INCLUDE_GRAPH = NO
INCLUDED_BY_GRAPH = YES INCLUDED_BY_GRAPH = NO
CALL_GRAPH = YES CALL_GRAPH = NO
CALLER_GRAPH = YES CALLER_GRAPH = NO
GRAPHICAL_HIERARCHY = YES GRAPHICAL_HIERARCHY = NO
DIRECTORY_GRAPH = YES DIRECTORY_GRAPH = YES
DOT_IMAGE_FORMAT = png DOT_IMAGE_FORMAT = png
#DOT_PATH = /usr/bin/dot #DOT_PATH = /usr/bin/dot

18
sources/ewol/docBook.h Normal file
View File

@ -0,0 +1,18 @@
/**
@mainpage Ewol Library framework
<center>
<h1>Ewol Library framework</h1>
Edouard DUPIN <sup>(C)</sup><br/>
License : BSD 3 clauses
</center>
Ewol is a basic graphic inteface for :
- Linux (X11)
- Windows
- MacOs
- Andoid
- Ios (in-progress)
*/

6
sources/ewol/renderer/eInput.cpp
View File

@ -337,7 +337,7 @@ void ewol::eInput::state(ewol::keyEvent::type_te _type,
// reject pointer == > out of IDs... // reject pointer == > out of IDs...
return; return;
} }
EWOL_DEBUG("event pointerId=" << _pointerID); EVENT_DEBUG("event pointerId=" << _pointerID);
// convert position in open-GL coordonates ... // convert position in open-GL coordonates ...
InputPoperty_ts *eventTable = NULL; InputPoperty_ts *eventTable = NULL;
inputLimit_ts localLimit; inputLimit_ts localLimit;
@ -361,7 +361,7 @@ void ewol::eInput::state(ewol::keyEvent::type_te _type,
ewol::Windows* tmpWindows = m_context.getWindows(); ewol::Windows* tmpWindows = m_context.getWindows();
if (true == _isDown) { if (true == _isDown) {
EWOL_VERBOSE("GUI : Input ID=" << _pointerID EVENT_DEBUG("GUI : Input ID=" << _pointerID
<< " == >" << eventTable[_pointerID].destinationInputId << " == >" << eventTable[_pointerID].destinationInputId
<< " [DOWN] " << _pos); << " [DOWN] " << _pos);
if(true == eventTable[_pointerID].isUsed) { if(true == eventTable[_pointerID].isUsed) {
@ -424,7 +424,7 @@ void ewol::eInput::state(ewol::keyEvent::type_te _type,
_pos); _pos);
} }
} else { } else {
EWOL_VERBOSE("GUI : Input ID=" << _pointerID EVENT_DEBUG("GUI : Input ID=" << _pointerID
<< " == >" << eventTable[_pointerID].destinationInputId << " == >" << eventTable[_pointerID].destinationInputId
<< " [UP] " << _pos); << " [UP] " << _pos);
if(false == eventTable[_pointerID].isUsed) { if(false == eventTable[_pointerID].isUsed) {

3
sources/ewol/widget/Button.h
View File

@ -23,8 +23,7 @@ namespace widget {
/** /**
* @brief a composed button is a button with an inside composed with the specify XML element == > this permit to generate standard element simple * @brief a composed button is a button with an inside composed with the specify XML element == > this permit to generate standard element simple
*/ */
class Button : public ewol::Widget class Button : public ewol::Widget {
{
public: public:
static void init(ewol::WidgetManager& _widgetManager); static void init(ewol::WidgetManager& _widgetManager);
// Event list of properties // Event list of properties

12
sources/ewol/widget/PopUp.h
View File

@ -58,12 +58,16 @@ namespace widget {
* @brief Request the Auto-remove when the event input is set outside the widget * @brief Request the Auto-remove when the event input is set outside the widget
* @param[in] _state New status * @param[in] _state New status
*/ */
void setRemoveOnExternClick(bool _state) { m_closeOutEvent = _state; }; void setRemoveOnExternClick(bool _state) {
m_closeOutEvent = _state;
};
/** /**
* @brief get the status of the request the Auto-remove when the event input is set outside the widget. * @brief get the status of the request the Auto-remove when the event input is set outside the widget.
* @return the status of the removing * @return the status of the removing
*/ */
bool getRemoveOnExternClick(void) const { return m_closeOutEvent; }; bool getRemoveOnExternClick(void) const {
return m_closeOutEvent;
};
private: private:
//float m_slidingProgress; //!< ratio progression of a sliding //float m_slidingProgress; //!< ratio progression of a sliding
public: public:
@ -96,7 +100,9 @@ namespace widget {
virtual void calculateSize(const vec2& _available); virtual void calculateSize(const vec2& _available);
virtual bool onEventInput(const ewol::EventInput& _event); virtual bool onEventInput(const ewol::EventInput& _event);
//virtual void calculateMinMaxSize(void); //virtual void calculateMinMaxSize(void);
virtual const char * const getObjectType(void) { return "ewol::PopUp"; }; virtual const char * const getObjectType(void) {
return "ewol::PopUp";
};
virtual ewol::Widget* getWidgetAtPos(const vec2& pos); virtual ewol::Widget* getWidgetAtPos(const vec2& pos);
}; };

12
sources/ewol/widget/Windows.cpp
View File

@ -14,6 +14,7 @@
#include <ewol/widget/Widget.h> #include <ewol/widget/Widget.h>
#include <ewol/widget/Windows.h> #include <ewol/widget/Windows.h>
#include <ewol/widget/WidgetManager.h> #include <ewol/widget/WidgetManager.h>
#include <ewol/widget/meta/StdPopUp.h>
#undef __class__ #undef __class__
#define __class__ "Windows" #define __class__ "Windows"
@ -227,19 +228,20 @@ void ewol::Windows::createPopUpMessage(enum popUpMessageType _type, const etk::U
} }
switch(_type) { switch(_type) {
case messageTypeInfo: case messageTypeInfo:
tmpPopUp->setTitle("Info"); tmpPopUp->setTitle("<bold>Info</bold>");
break; break;
case messageTypeWarning: case messageTypeWarning:
tmpPopUp->setTitle("Warning"); tmpPopUp->setTitle("<bold><font color=\"orange\">Warning</font></bold>");
break; break;
case messageTypeError: case messageTypeError:
tmpPopUp->setTitle("Error"); tmpPopUp->setTitle("<bold><font color=\"red\">Error</font></bold>");
break; break;
case messageTypeCritical: case messageTypeCritical:
tmpPopUp->setTitle("Critical"); tmpPopUp->setTitle("<bold><font colorBg=\"red\">Critical</font></bold>");
break; break;
} }
tmpPopUp->setComment(_message); tmpPopUp->setComment(_message);
tmpPopUp->setButtonLabel(0, "close"); tmpPopUp->addButton("close", true);
tmpPopUp->setRemoveOnExternClick(true);
popUpWidgetPush(tmpPopUp); popUpWidgetPush(tmpPopUp);
} }

12
sources/ewol/widget/Windows.h
View File

@ -47,8 +47,8 @@ namespace ewol {
ewol::Widget* m_subWidget; ewol::Widget* m_subWidget;
etk::Vector<ewol::Widget*> m_popUpWidgetList; etk::Vector<ewol::Widget*> m_popUpWidgetList;
public: public:
void setSubWidget(ewol::Widget * widget); void setSubWidget(ewol::Widget* _widget);
void popUpWidgetPush(ewol::Widget * widget); void popUpWidgetPush(ewol::Widget* _widget);
private: private:
etk::Color<float> m_backgroundColor; //!< reset color of the Main windows etk::Color<float> m_backgroundColor; //!< reset color of the Main windows
public: public:
@ -56,7 +56,9 @@ namespace ewol {
* @brief get the background color. * @brief get the background color.
* @return A reference on the color * @return A reference on the color
*/ */
const etk::Color<float>& getBackgroundColor(void) { return m_backgroundColor; }; const etk::Color<float>& getBackgroundColor(void) {
return m_backgroundColor;
};
/** /**
* @brief set the background color. * @brief set the background color.
* @param[IN] the new requested color. * @param[IN] the new requested color.
@ -65,7 +67,9 @@ namespace ewol {
protected: // Derived function protected: // Derived function
virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual void systemDraw(const ewol::DrawProperty& _displayProp);
public: // Derived function public: // Derived function
virtual const char * const getObjectType(void) { return "ewol::Windows"; }; virtual const char * const getObjectType(void) {
return "ewol::Windows";
};
virtual void onRegenerateDisplay(void); virtual void onRegenerateDisplay(void);
virtual void onObjectRemove(ewol::EObject * _removeObject); virtual void onObjectRemove(ewol::EObject * _removeObject);
virtual void calculateSize(const vec2& _availlable); virtual void calculateSize(const vec2& _availlable);

28
sources/ewol/widget/meta/FileChooser.cpp
View File

@ -30,8 +30,8 @@ extern "C" {
#define __class__ "FileChooser" #define __class__ "FileChooser"
extern const char * const ewolEventFileChooserCancel = "ewol-event-file-chooser-cancel"; extern const char * const widget::FileChooser::eventCancel = "ewol-event-file-chooser-cancel";
extern const char * const ewolEventFileChooserValidate = "ewol-event-file-chooser-validate"; extern const char * const widget::FileChooser::eventValidate = "ewol-event-file-chooser-validate";
extern const char * const ewolEventFileChooserHidenFileChange = "ewol-event-file-chooser-Show/Hide-hiden-Files"; extern const char * const ewolEventFileChooserHidenFileChange = "ewol-event-file-chooser-Show/Hide-hiden-Files";
extern const char * const ewolEventFileChooserEntryFolder = "ewol-event-file-chooser-modify-entry-folder"; extern const char * const ewolEventFileChooserEntryFolder = "ewol-event-file-chooser-modify-entry-folder";
extern const char * const ewolEventFileChooserEntryFolderEnter = "ewol-event-file-chooser-modify-entry-folder-enter"; extern const char * const ewolEventFileChooserEntryFolderEnter = "ewol-event-file-chooser-modify-entry-folder-enter";
@ -44,8 +44,8 @@ extern const char * const ewolEventFileChooserHome = "ewol-event-fil
widget::FileChooser::FileChooser(void) { widget::FileChooser::FileChooser(void) {
addEventId(ewolEventFileChooserCancel); addEventId(eventCancel);
addEventId(ewolEventFileChooserValidate); addEventId(eventValidate);
m_widgetTitle = NULL; m_widgetTitle = NULL;
m_widgetValidate = NULL; m_widgetValidate = NULL;
@ -146,7 +146,7 @@ widget::FileChooser::FileChooser(void) {
" <label>Validate</label>\n" " <label>Validate</label>\n"
" </sizer>\n" " </sizer>\n"
"</composer>\n")); "</composer>\n"));
m_widgetValidate->registerOnEvent(this, widget::Button::eventPressed, ewolEventFileChooserValidate); m_widgetValidate->registerOnEvent(this, widget::Button::eventPressed, eventValidate);
mySizerHori->subWidgetAdd(m_widgetValidate); mySizerHori->subWidgetAdd(m_widgetValidate);
} }
m_widgetCancel = new widget::Button(); m_widgetCancel = new widget::Button();
@ -161,7 +161,7 @@ widget::FileChooser::FileChooser(void) {
" <label>Cancel</label>\n" " <label>Cancel</label>\n"
" </sizer>\n" " </sizer>\n"
"</composer>\n")); "</composer>\n"));
m_widgetCancel->registerOnEvent(this, widget::Button::eventPressed, ewolEventFileChooserCancel); m_widgetCancel->registerOnEvent(this, widget::Button::eventPressed, eventCancel);
mySizerHori->subWidgetAdd(m_widgetCancel); mySizerHori->subWidgetAdd(m_widgetCancel);
} }
} }
@ -294,14 +294,14 @@ widget::FileChooser::~FileChooser(void) {
} }
void widget::FileChooser::setTitle(etk::UString _label) { void widget::FileChooser::setTitle(const etk::UString& _label) {
if (NULL == m_widgetTitle) { if (NULL == m_widgetTitle) {
return; return;
} }
m_widgetTitle->setLabel(_label); m_widgetTitle->setLabel(_label);
} }
void widget::FileChooser::setValidateLabel(etk::UString _label) { void widget::FileChooser::setValidateLabel(const etk::UString& _label) {
if (NULL == m_widgetValidate) { if (NULL == m_widgetValidate) {
return; return;
} }
@ -311,7 +311,7 @@ void widget::FileChooser::setValidateLabel(etk::UString _label) {
*/ */
} }
void widget::FileChooser::setCancelLabel(etk::UString _label) { void widget::FileChooser::setCancelLabel(const etk::UString& _label) {
if (NULL == m_widgetCancel) { if (NULL == m_widgetCancel) {
return; return;
} }
@ -321,12 +321,12 @@ void widget::FileChooser::setCancelLabel(etk::UString _label) {
*/ */
} }
void widget::FileChooser::setFolder(etk::UString _folder) { void widget::FileChooser::setFolder(const etk::UString& _folder) {
m_folder = _folder + "/"; m_folder = _folder + "/";
updateCurrentFolder(); updateCurrentFolder();
} }
void widget::FileChooser::setFileName(etk::UString _filename) { void widget::FileChooser::setFileName(const etk::UString& _filename) {
m_file = _filename; m_file = _filename;
if (NULL == m_widgetCurrentFileName) { if (NULL == m_widgetCurrentFileName) {
return; return;
@ -346,7 +346,7 @@ void widget::FileChooser::onReceiveMessage(const ewol::EMessage& _msg) {
if (m_widgetListFile != NULL) { if (m_widgetListFile != NULL) {
m_widgetListFile->setSelect(m_file); m_widgetListFile->setSelect(m_file);
} }
} else if (ewolEventFileChooserCancel == _msg.getMessage()) { } else if (eventCancel == _msg.getMessage()) {
// == > Auto remove ... // == > Auto remove ...
generateEventId(_msg.getMessage()); generateEventId(_msg.getMessage());
autoDestroy(); autoDestroy();
@ -380,7 +380,7 @@ void widget::FileChooser::onReceiveMessage(const ewol::EMessage& _msg) {
tmpFileCompleatName += m_file; tmpFileCompleatName += m_file;
generateEventId(_msg.getMessage(), tmpFileCompleatName); generateEventId(_msg.getMessage(), tmpFileCompleatName);
} else if( _msg.getMessage() == ewolEventFileChooserListFileValidate } else if( _msg.getMessage() == ewolEventFileChooserListFileValidate
|| (_msg.getMessage() == ewolEventFileChooserValidate && m_file != "" ) || (_msg.getMessage() == eventValidate && m_file != "" )
|| (_msg.getMessage() == ewolEventFileChooserEntryFileEnter && m_file != "" ) ) { || (_msg.getMessage() == ewolEventFileChooserEntryFileEnter && m_file != "" ) ) {
// select the file == > generate a validate // select the file == > generate a validate
if (_msg.getData() != "") { if (_msg.getData() != "") {
@ -389,7 +389,7 @@ void widget::FileChooser::onReceiveMessage(const ewol::EMessage& _msg) {
EWOL_VERBOSE(" generate a fiel opening : \"" << m_folder << "\" / \"" << m_file << "\""); EWOL_VERBOSE(" generate a fiel opening : \"" << m_folder << "\" / \"" << m_file << "\"");
etk::UString tmpFileCompleatName = m_folder; etk::UString tmpFileCompleatName = m_folder;
tmpFileCompleatName += m_file; tmpFileCompleatName += m_file;
generateEventId(ewolEventFileChooserValidate, tmpFileCompleatName); generateEventId(eventValidate, tmpFileCompleatName);
autoDestroy(); autoDestroy();
} else if(ewolEventFileChooserHome == _msg.getMessage()) { } else if(ewolEventFileChooserHome == _msg.getMessage()) {
etk::UString tmpUserFolder = etk::getUserHomeFolder(); etk::UString tmpUserFolder = etk::getUserHomeFolder();

33
sources/ewol/widget/meta/FileChooser.h
View File

@ -18,25 +18,16 @@
#include <ewol/widget/CheckBox.h> #include <ewol/widget/CheckBox.h>
#include <ewol/widget/ListFileSystem.h> #include <ewol/widget/ListFileSystem.h>
extern const char * const ewolEventFileChooserCancel;
extern const char * const ewolEventFileChooserValidate;
namespace widget { namespace widget {
class FileChooser : public widget::PopUp { class FileChooser : public widget::PopUp {
public:
// Event list of properties
static const char* const eventCancel;
static const char* const eventValidate;
// Config list of properties
public: public:
FileChooser(void); FileChooser(void);
virtual ~FileChooser(void); virtual ~FileChooser(void);
// Derived function
virtual const char * const getObjectType(void) { return "Ewol::fileChooser"; };
virtual void onReceiveMessage(const ewol::EMessage& _msg);
virtual void onObjectRemove(ewol::EObject * removeObject);
void setTitle(etk::UString label);
void setValidateLabel(etk::UString label);
void setCancelLabel(etk::UString label);
void setFolder(etk::UString folder);
void setFileName(etk::UString filename);
etk::UString getCompleateFileName(void);
void updateCurrentFolder(void);
private: private:
widget::Label* m_widgetTitle; widget::Label* m_widgetTitle;
widget::Button* m_widgetValidate; widget::Button* m_widgetValidate;
@ -48,6 +39,20 @@ namespace widget {
widget::CheckBox* m_widgetCheckBox; widget::CheckBox* m_widgetCheckBox;
etk::UString m_folder; etk::UString m_folder;
etk::UString m_file; etk::UString m_file;
public:
void setTitle(const etk::UString& _label);
void setValidateLabel(const etk::UString& _label);
void setCancelLabel(const etk::UString& _label);
void setFolder(const etk::UString& _folder);
void setFileName(const etk::UString& _filename);
etk::UString getCompleateFileName(void);
void updateCurrentFolder(void);
public: // Derived function
virtual const char * const getObjectType(void) {
return "Ewol::fileChooser";
};
virtual void onReceiveMessage(const ewol::EMessage& _msg);
virtual void onObjectRemove(ewol::EObject* _removeObject);
}; };
}; };

179
sources/ewol/widget/meta/StdPopUp.cpp
View File

@ -6,10 +6,8 @@
* @license BSD v3 (see license file) * @license BSD v3 (see license file)
*/ */
#include <ewol/widget/meta/stdPopUp.h> #include <ewol/widget/meta/StdPopUp.h>
#include <ewol/widget/Button.h> #include <ewol/widget/Sizer.h>
#include <ewol/widget/SizerHori.h>
#include <ewol/widget/SizerVert.h>
#include <ewol/widget/Spacer.h> #include <ewol/widget/Spacer.h>
#include <ewol/widget/Label.h> #include <ewol/widget/Label.h>
#include <ewol/widget/WidgetManager.h> #include <ewol/widget/WidgetManager.h>
@ -18,111 +16,124 @@
#undef __class__ #undef __class__
#define __class__ "ewol::StdPopUp" #define __class__ "ewol::StdPopUp"
const char * const widget::StdPopUp::eventButton = "ewol-event-pop-up-button"; static const char * const eventButtonExit = "ewol-event-pop-up-exit-button";
widget::StdPopUp::StdPopUp(void) : widget::StdPopUp::StdPopUp(void) :
m_title(NULL), m_title(NULL),
m_comment(NULL) { m_comment(NULL),
addEventId(eventButton); m_subBar(NULL) {
setMinSize(ewol::Dimension(vec2(20,10),ewol::Dimension::Pourcent));
widget::Sizer* mySizerVert = NULL;
widget::Spacer* mySpacer = NULL;
mySizerVert = new widget::Sizer(widget::Sizer::modeVert);
ewol::sizerVert * mySizerVert = NULL;
ewol::sizerHori * mySizerHori = NULL;
ewol::Button * myButton = NULL;
ewol::Entry * myEntry = NULL;
ewol::Spacer * mySpacer = NULL;
fileChooserFileList * myListFile = NULL;
fileChooserFolderList * myListFolder = NULL;
ewol::Label * myLabel = NULL;
mySizerVert = new ewol::sizerVert();
// set it in the pop-up-system : // set it in the pop-up-system :
subWidgetSet(mySizerVert); setSubWidget(mySizerVert);
myLabel = new ewol::Label("File chooser ..."); m_subBar = new widget::Sizer(widget::Sizer::modeHori);
m_widgetTitleId = myLabel->getWidgetId(); m_subBar->lockExpand(bvec2(true,true));
mySizerVert->subWidgetAdd(myLabel); m_subBar->setExpand(bvec2(true,false));
mySizerVert->subWidgetAdd(m_subBar);
mySpacer = new widget::Spacer();
mySpacer->setExpand(bvec2(true,false));
m_subBar->subWidgetAdd(mySpacer);
mySizerHori = new ewol::sizerHori(); mySpacer = new widget::Spacer();
mySizerHori->lockExpendContamination(true); mySpacer->setExpand(bvec2(true,false));
mySizerVert->subWidgetAdd(mySizerHori); mySpacer->setColor(etk::Color<>(0x888888FF));
myButton = new ewol::Button("<-"); mySpacer->setMinSize(ewol::Dimension(vec2(0,3),ewol::Dimension::Pixel));
myButton->externLinkOnEvent("ewol Button Pressed", getWidgetId(), ewolEventFileChooserFolderUp ); mySizerVert->subWidgetAdd(mySpacer);
mySizerHori->subWidgetAdd(myButton);
myEntry = new ewol::Entry("~/"); mySpacer = new widget::Spacer();
m_widgetCurrentFolderId = myEntry->getWidgetId(); mySpacer->setExpand(bvec2(true,false));
myEntry->setExpendX(true); mySpacer->setMinSize(ewol::Dimension(vec2(0,5),ewol::Dimension::Pixel));
myEntry->setFillX(true); mySizerVert->subWidgetAdd(mySpacer);
myEntry->setWidth(200);
mySizerHori->subWidgetAdd(myEntry); m_comment = new widget::Label("No Label");
m_comment->setExpand(bvec2(true,true));
mySizerHori = new ewol::sizerHori(); mySizerVert->subWidgetAdd(m_comment);
mySizerHori->lockExpendContamination(true);
mySizerVert->subWidgetAdd(mySizerHori); mySpacer = new widget::Spacer();
myListFolder = new fileChooserFolderList(); mySpacer->setExpand(bvec2(true,false));
m_widgetListFolderId = myListFolder->getWidgetId(); mySpacer->setMinSize(ewol::Dimension(vec2(0,5),ewol::Dimension::Pixel));
//myList->setExpendX(true); mySizerVert->subWidgetAdd(mySpacer);
myListFolder->setExpendY(true);
myListFolder->setFillY(true); mySpacer = new widget::Spacer();
mySizerHori->subWidgetAdd(myListFolder); mySpacer->setExpand(bvec2(true,false));
myListFile = new fileChooserFileList(); mySpacer->setColor(etk::Color<>(0x888888FF));
m_widgetListFileId = myListFile->getWidgetId(); mySpacer->setMinSize(ewol::Dimension(vec2(0,3),ewol::Dimension::Pixel));
myListFile->setExpendY(true); mySizerVert->subWidgetAdd(mySpacer);
myListFile->setFillX(true);
myListFile->setExpendY(true); m_title = new widget::Label("<bold>Message</bold>");
myListFile->setFillY(true); m_title->setExpand(bvec2(true,false));
mySizerHori->subWidgetAdd(myListFile); m_title->setFill(bvec2(true,true));
mySizerVert->subWidgetAdd(m_title);
mySizerHori = new ewol::sizerHori();
mySizerHori->lockExpendContamination(true);
mySizerVert->subWidgetAdd(mySizerHori);
mySpacer = new ewol::Spacer();
mySpacer->setExpendX(true);
mySizerHori->subWidgetAdd(mySpacer);
myButton = new ewol::Button("Open");
m_widgetValidateId = myButton->getWidgetId();
myButton->externLinkOnEvent("ewol Button Pressed", getWidgetId(), ewolEventFileChooserValidate);
mySizerHori->subWidgetAdd(myButton);
myButton = new ewol::Button("Cancel");
m_widgetCancelId = myButton->getWidgetId();
myButton->externLinkOnEvent("ewol Button Pressed", getWidgetId(), ewolEventFileChooserCancel);
mySizerHori->subWidgetAdd(myButton);
} }
widget::StdPopUp::~StdPopUp(void) { widget::StdPopUp::~StdPopUp(void) {
} }
void widget::StdPopUp::setTitle(const etk::UString& _label) { void widget::StdPopUp::setTitle(const etk::UString& _text) {
ewol::Label * tmpWidget = (ewol::Label*)ewol::widgetManager::get(m_widgetTitleId); if (m_title == NULL) {
if (NULL == tmpWidget) {
return; return;
} }
tmpWidget->setLabel(_label); m_title->setLabel(_text);
markToRedraw();
} }
void widget::StdPopUp::setValidateLabel(const etk::UString& _label) { void widget::StdPopUp::setComment(const etk::UString& _text) {
ewol::Button * tmpWidget = (ewol::Button*)ewol::widgetManager::get(m_widgetValidateId); if (m_comment == NULL) {
if (NULL == tmpWidget) {
return; return;
} }
tmpWidget->setLabel(_label); m_comment->setLabel(_text);
markToRedraw();
} }
void widget::StdPopUp::setCancelLabel(const etk::UString& _label) { widget::Button* widget::StdPopUp::addButton(const etk::UString& _text, bool _autoExit) {
ewol::Button * tmpWidget = (ewol::Button*)ewol::widgetManager::get(m_widgetCancelId); if (m_subBar == NULL) {
if (NULL == tmpWidget) { EWOL_ERROR("button-bar does not existed ...");
return NULL;
}
widget::Button* myButton = new widget::Button();
if (myButton == NULL) {
EWOL_ERROR("Can not allocate new button ...");
return NULL;
}
myButton->setSubWidget(new widget::Label(_text));
if(_autoExit == true) {
myButton->registerOnEvent(this, widget::Button::eventPressed, eventButtonExit);
}
m_subBar->subWidgetAdd(myButton);
markToRedraw();
return myButton;
}
void widget::StdPopUp::onObjectRemove(ewol::EObject* _removeObject) {
// call parent:
widget::PopUp::onObjectRemove(_removeObject);
if (_removeObject == m_subBar) {
m_subBar = NULL;
markToRedraw();
return;
}
if (_removeObject == m_comment) {
m_comment = NULL;
markToRedraw();
return;
}
if (_removeObject == m_title) {
m_title = NULL;
markToRedraw();
return; return;
} }
tmpWidget->setLabel(_label);
} }
bool widget::StdPopUp::onEventAreaExternal(int32_t _widgetID, const char *_generateEventId, const char *_eventExternId, float _x, float _y) { void widget::StdPopUp::onReceiveMessage(const ewol::EMessage& _msg) {
EWOL_INFO("Receive Event from the BT ... : widgetid=" << _widgetID << "\"" << _generateEventId << "\" == > internalEvent=\"" << _eventExternId << "\"" ); // call parent:
if (ewolEventFileChooserCancel == _eventExternId) { widget::PopUp::onReceiveMessage(_msg);
// == > Auto remove ... if (_msg.getMessage() == eventButtonExit) {
autoDestroy();
} }
return genEventInputExternal(_eventExternId, _x, _y);
} }

74
sources/ewol/widget/meta/StdPopUp.h
View File

@ -9,33 +9,79 @@
#ifndef __EWOL_STD_POP_UP_H__ #ifndef __EWOL_STD_POP_UP_H__
#define __EWOL_STD_POP_UP_H__ #define __EWOL_STD_POP_UP_H__
#include <etk/Types.h>
#include <ewol/Debug.h>
#include <ewol/widget/PopUp.h> #include <ewol/widget/PopUp.h>
#include <ewol/widget/Label.h> #include <ewol/widget/Label.h>
#include <ewol/widget/Button.h> #include <ewol/widget/Button.h>
#include <ewol/widget/Sizer.h>
namespace widget { namespace widget {
/**
* @brief The std pop up widget is a siple message widget to notyfy user of some simple things, like:
*/
/**
* @page DSP_Perfo Performances :
* <pre>
* +---------------------------------+---+---+---+
* | Windows name... | _ | O | X |
* +---------------------------------+---+---+---+
* | |
* | |
* | |
* | +-------------------+ |
* | | Erreur: | |
* | | | |
* | | Message to diplay | |
* | | to user | |
* | | | |
* | | Close | |
* | +-------------------+ |
* | |
* | |
* | |
* +---------------------------------------------+
* </pre>
*/
class StdPopUp : public widget::PopUp { class StdPopUp : public widget::PopUp {
public: public:
// Event list of properties /**
static const char * const eventButton; * @brief std-pop-up constructor.
public: */
StdPopUp(void); StdPopUp(void);
/**
* @brief std-pop-up destructor.
*/
~StdPopUp(void); ~StdPopUp(void);
// Derived function protected:
widget::Label* m_title; //!< Title Label widget
public:
/**
* @brief Set the title string.
* @param[in] _text Decorated text to diplay in title.
*/
void setTitle(const etk::UString& _text);
protected:
widget::Label* m_comment; //!< Comment label widget
public:
/**
* @brief Set the commentary string.
* @param[in] _text Decorated text to diplay in Comment.
*/
void setComment(const etk::UString& _text);
protected:
widget::Sizer* m_subBar; //!< subwidget bar containing all the button.
public:
/**
* @brief Add a buttom button.
* @param[in] _text Decorated text to diplay in button.
*/
widget::Button* addButton(const etk::UString& _text, bool _autoExit=false);
public: // Derived function
virtual const char * const getObjectType(void) { virtual const char * const getObjectType(void) {
return "ewol::StdPopUp"; return "ewol::StdPopUp";
}; };
void setTitle(const etk::UString& _text); virtual void onObjectRemove(ewol::EObject* _removeObject);
void setComment(const etk::UString& _text); virtual void onReceiveMessage(const ewol::EMessage& _msg);
void addButton(const etk::UString& _text);
private:
widget::Label* m_title;
widget::Label* m_comment;
etk::Vector<widget::Button*> m_button;
}; };
}; };
#endif #endif