From fea01d57c3fa0680da4322a158a37a2570af1065 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 7 Mar 2017 22:06:36 +0100 Subject: [PATCH] [DEV/DEBUG] move basic images & add ewol-data & update property menu & debug display error of images --- data/ewol-gui-file-chooser.xml | 10 ++-- data/theme/default/Add.svg | 7 +++ data/theme/default/AtoZ.svg | 11 +++++ data/theme/default/Attache.svg | 7 +++ data/theme/default/CaseSensitive.svg | 13 ++++++ data/theme/default/Close.svg | 9 ++++ data/theme/default/Contact.svg | 14 ++++++ data/theme/default/Down.svg | 14 ++++++ data/theme/default/FavoriteDisable.svg | 7 +++ data/theme/default/FavoriteEnable.svg | 9 ++++ data/theme/default/FavoriteMiddle.svg | 9 ++++ data/theme/default/File.svg | 4 ++ data/theme/default/Folder.svg | 7 +++ data/theme/default/Forbidden.svg | 60 ++++++++++++++++++++++++ data/theme/default/Help.svg | 7 +++ data/theme/default/Home.svg | 11 +++++ data/theme/default/Info.svg | 7 +++ data/theme/default/List.svg | 11 +++++ data/theme/default/Load.svg | 7 +++ data/theme/default/Lock.svg | 7 +++ data/theme/default/Next.svg | 7 +++ data/theme/default/OpenMenu.svg | 9 ++++ data/theme/default/Parameter.svg | 61 +++++++++++++++++++++++++ data/theme/default/Previous.svg | 7 +++ data/theme/default/Quit.svg | 9 ++++ data/theme/default/Redo.svg | 12 +++++ data/theme/default/Remove.svg | 7 +++ data/theme/default/Remove2.svg | 63 ++++++++++++++++++++++++++ data/theme/default/Replace.svg | 15 ++++++ data/theme/default/SDCard.svg | 7 +++ data/theme/default/Save.svg | 16 +++++++ data/theme/default/Search.svg | 49 ++++++++++++++++++++ data/theme/default/Trash.svg | 9 ++++ data/theme/default/Undo.svg | 12 +++++ data/theme/default/Up.svg | 14 ++++++ data/theme/default/Update.svg | 9 ++++ data/theme/default/Validate.svg | 7 +++ data/theme/default/VolumeMax.svg | 13 ++++++ data/theme/default/VolumeMute.svg | 9 ++++ data/theme/default/Warning.svg | 7 +++ data/theme/default/WhereAmI.svg | 17 +++++++ data/theme/default/WrapAround.svg | 13 ++++++ data/theme/default/ZoomIn.svg | 9 ++++ ewol/widget/meta/ParameterList.cpp | 62 ++++++++++++------------- ewol/widget/meta/ParameterList.hpp | 6 +-- lutin_ewol-data.py | 46 +++++++++++++++++++ lutin_ewol.py | 18 +------- 47 files changed, 685 insertions(+), 59 deletions(-) create mode 100644 data/theme/default/Add.svg create mode 100644 data/theme/default/AtoZ.svg create mode 100644 data/theme/default/Attache.svg create mode 100644 data/theme/default/CaseSensitive.svg create mode 100644 data/theme/default/Close.svg create mode 100644 data/theme/default/Contact.svg create mode 100644 data/theme/default/Down.svg create mode 100644 data/theme/default/FavoriteDisable.svg create mode 100644 data/theme/default/FavoriteEnable.svg create mode 100644 data/theme/default/FavoriteMiddle.svg create mode 100644 data/theme/default/File.svg create mode 100644 data/theme/default/Folder.svg create mode 100644 data/theme/default/Forbidden.svg create mode 100644 data/theme/default/Help.svg create mode 100644 data/theme/default/Home.svg create mode 100644 data/theme/default/Info.svg create mode 100644 data/theme/default/List.svg create mode 100644 data/theme/default/Load.svg create mode 100644 data/theme/default/Lock.svg create mode 100644 data/theme/default/Next.svg create mode 100644 data/theme/default/OpenMenu.svg create mode 100644 data/theme/default/Parameter.svg create mode 100644 data/theme/default/Previous.svg create mode 100644 data/theme/default/Quit.svg create mode 100644 data/theme/default/Redo.svg create mode 100644 data/theme/default/Remove.svg create mode 100644 data/theme/default/Remove2.svg create mode 100644 data/theme/default/Replace.svg create mode 100644 data/theme/default/SDCard.svg create mode 100644 data/theme/default/Save.svg create mode 100644 data/theme/default/Search.svg create mode 100644 data/theme/default/Trash.svg create mode 100644 data/theme/default/Undo.svg create mode 100644 data/theme/default/Up.svg create mode 100644 data/theme/default/Update.svg create mode 100644 data/theme/default/Validate.svg create mode 100644 data/theme/default/VolumeMax.svg create mode 100644 data/theme/default/VolumeMute.svg create mode 100644 data/theme/default/Warning.svg create mode 100644 data/theme/default/WhereAmI.svg create mode 100644 data/theme/default/WrapAround.svg create mode 100644 data/theme/default/ZoomIn.svg create mode 100644 lutin_ewol-data.py diff --git a/data/ewol-gui-file-chooser.xml b/data/ewol-gui-file-chooser.xml index 9a89dca0..8c0efdac 100644 --- a/data/ewol-gui-file-chooser.xml +++ b/data/ewol-gui-file-chooser.xml @@ -7,13 +7,13 @@ @@ -37,13 +37,13 @@ - + - + - + diff --git a/data/theme/default/Add.svg b/data/theme/default/Add.svg new file mode 100644 index 00000000..562f893e --- /dev/null +++ b/data/theme/default/Add.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/data/theme/default/AtoZ.svg b/data/theme/default/AtoZ.svg new file mode 100644 index 00000000..781cd3cc --- /dev/null +++ b/data/theme/default/AtoZ.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/data/theme/default/Attache.svg b/data/theme/default/Attache.svg new file mode 100644 index 00000000..84be150d --- /dev/null +++ b/data/theme/default/Attache.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/data/theme/default/CaseSensitive.svg b/data/theme/default/CaseSensitive.svg new file mode 100644 index 00000000..5ef3f6ce --- /dev/null +++ b/data/theme/default/CaseSensitive.svg @@ -0,0 +1,13 @@ + + + + + image/svg+xml + + + + + + + + diff --git a/data/theme/default/Close.svg b/data/theme/default/Close.svg new file mode 100644 index 00000000..ef041c86 --- /dev/null +++ b/data/theme/default/Close.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/data/theme/default/Contact.svg b/data/theme/default/Contact.svg new file mode 100644 index 00000000..61e6b2de --- /dev/null +++ b/data/theme/default/Contact.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/data/theme/default/Down.svg b/data/theme/default/Down.svg new file mode 100644 index 00000000..1e34f0d7 --- /dev/null +++ b/data/theme/default/Down.svg @@ -0,0 +1,14 @@ + + + + + image/svg+xml + + + + + + + + + diff --git a/data/theme/default/FavoriteDisable.svg b/data/theme/default/FavoriteDisable.svg new file mode 100644 index 00000000..5d9e376b --- /dev/null +++ b/data/theme/default/FavoriteDisable.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/data/theme/default/FavoriteEnable.svg b/data/theme/default/FavoriteEnable.svg new file mode 100644 index 00000000..804bb845 --- /dev/null +++ b/data/theme/default/FavoriteEnable.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/data/theme/default/FavoriteMiddle.svg b/data/theme/default/FavoriteMiddle.svg new file mode 100644 index 00000000..4a3a6164 --- /dev/null +++ b/data/theme/default/FavoriteMiddle.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/data/theme/default/File.svg b/data/theme/default/File.svg new file mode 100644 index 00000000..9cdd5b94 --- /dev/null +++ b/data/theme/default/File.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/theme/default/Folder.svg b/data/theme/default/Folder.svg new file mode 100644 index 00000000..3f309e22 --- /dev/null +++ b/data/theme/default/Folder.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/data/theme/default/Forbidden.svg b/data/theme/default/Forbidden.svg new file mode 100644 index 00000000..fa523d02 --- /dev/null +++ b/data/theme/default/Forbidden.svg @@ -0,0 +1,60 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/data/theme/default/Help.svg b/data/theme/default/Help.svg new file mode 100644 index 00000000..8dd63d79 --- /dev/null +++ b/data/theme/default/Help.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/data/theme/default/Home.svg b/data/theme/default/Home.svg new file mode 100644 index 00000000..4aa0a070 --- /dev/null +++ b/data/theme/default/Home.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/data/theme/default/Info.svg b/data/theme/default/Info.svg new file mode 100644 index 00000000..3c957ffd --- /dev/null +++ b/data/theme/default/Info.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/data/theme/default/List.svg b/data/theme/default/List.svg new file mode 100644 index 00000000..8f2414a5 --- /dev/null +++ b/data/theme/default/List.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/data/theme/default/Load.svg b/data/theme/default/Load.svg new file mode 100644 index 00000000..926fb253 --- /dev/null +++ b/data/theme/default/Load.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/data/theme/default/Lock.svg b/data/theme/default/Lock.svg new file mode 100644 index 00000000..b4d88e64 --- /dev/null +++ b/data/theme/default/Lock.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/data/theme/default/Next.svg b/data/theme/default/Next.svg new file mode 100644 index 00000000..8ac2c931 --- /dev/null +++ b/data/theme/default/Next.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/data/theme/default/OpenMenu.svg b/data/theme/default/OpenMenu.svg new file mode 100644 index 00000000..7754b5e8 --- /dev/null +++ b/data/theme/default/OpenMenu.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/data/theme/default/Parameter.svg b/data/theme/default/Parameter.svg new file mode 100644 index 00000000..5eeed268 --- /dev/null +++ b/data/theme/default/Parameter.svg @@ -0,0 +1,61 @@ + + + + + + + + + + image/svg+xml + + + + + + + diff --git a/data/theme/default/Previous.svg b/data/theme/default/Previous.svg new file mode 100644 index 00000000..08c79b53 --- /dev/null +++ b/data/theme/default/Previous.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/data/theme/default/Quit.svg b/data/theme/default/Quit.svg new file mode 100644 index 00000000..bc512d1b --- /dev/null +++ b/data/theme/default/Quit.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/data/theme/default/Redo.svg b/data/theme/default/Redo.svg new file mode 100644 index 00000000..a76f98cf --- /dev/null +++ b/data/theme/default/Redo.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/data/theme/default/Remove.svg b/data/theme/default/Remove.svg new file mode 100644 index 00000000..e4c4d79a --- /dev/null +++ b/data/theme/default/Remove.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/data/theme/default/Remove2.svg b/data/theme/default/Remove2.svg new file mode 100644 index 00000000..29be9c9e --- /dev/null +++ b/data/theme/default/Remove2.svg @@ -0,0 +1,63 @@ + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/data/theme/default/Replace.svg b/data/theme/default/Replace.svg new file mode 100644 index 00000000..2d59c32c --- /dev/null +++ b/data/theme/default/Replace.svg @@ -0,0 +1,15 @@ + + + + + image/svg+xml + + + + + + + + + + diff --git a/data/theme/default/SDCard.svg b/data/theme/default/SDCard.svg new file mode 100644 index 00000000..1b434d34 --- /dev/null +++ b/data/theme/default/SDCard.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/data/theme/default/Save.svg b/data/theme/default/Save.svg new file mode 100644 index 00000000..138c8a4e --- /dev/null +++ b/data/theme/default/Save.svg @@ -0,0 +1,16 @@ + + + + + + + + + \ No newline at end of file diff --git a/data/theme/default/Search.svg b/data/theme/default/Search.svg new file mode 100644 index 00000000..272fb0b3 --- /dev/null +++ b/data/theme/default/Search.svg @@ -0,0 +1,49 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/data/theme/default/Trash.svg b/data/theme/default/Trash.svg new file mode 100644 index 00000000..c7765e99 --- /dev/null +++ b/data/theme/default/Trash.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/data/theme/default/Undo.svg b/data/theme/default/Undo.svg new file mode 100644 index 00000000..2cdc7f80 --- /dev/null +++ b/data/theme/default/Undo.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/data/theme/default/Up.svg b/data/theme/default/Up.svg new file mode 100644 index 00000000..273a0fe5 --- /dev/null +++ b/data/theme/default/Up.svg @@ -0,0 +1,14 @@ + + + + + image/svg+xml + + + + + + + + + diff --git a/data/theme/default/Update.svg b/data/theme/default/Update.svg new file mode 100644 index 00000000..67286a1a --- /dev/null +++ b/data/theme/default/Update.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/data/theme/default/Validate.svg b/data/theme/default/Validate.svg new file mode 100644 index 00000000..54e9f80d --- /dev/null +++ b/data/theme/default/Validate.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/data/theme/default/VolumeMax.svg b/data/theme/default/VolumeMax.svg new file mode 100644 index 00000000..181f34d3 --- /dev/null +++ b/data/theme/default/VolumeMax.svg @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/data/theme/default/VolumeMute.svg b/data/theme/default/VolumeMute.svg new file mode 100644 index 00000000..a28cefb6 --- /dev/null +++ b/data/theme/default/VolumeMute.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/data/theme/default/Warning.svg b/data/theme/default/Warning.svg new file mode 100644 index 00000000..2e1cbd7c --- /dev/null +++ b/data/theme/default/Warning.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/data/theme/default/WhereAmI.svg b/data/theme/default/WhereAmI.svg new file mode 100644 index 00000000..80e6032b --- /dev/null +++ b/data/theme/default/WhereAmI.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + diff --git a/data/theme/default/WrapAround.svg b/data/theme/default/WrapAround.svg new file mode 100644 index 00000000..116be270 --- /dev/null +++ b/data/theme/default/WrapAround.svg @@ -0,0 +1,13 @@ + + + + + image/svg+xml + + + + + + + + diff --git a/data/theme/default/ZoomIn.svg b/data/theme/default/ZoomIn.svg new file mode 100644 index 00000000..25578fc7 --- /dev/null +++ b/data/theme/default/ZoomIn.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/ewol/widget/meta/ParameterList.cpp b/ewol/widget/meta/ParameterList.cpp index cedec8ed..c9749f1a 100644 --- a/ewol/widget/meta/ParameterList.cpp +++ b/ewol/widget/meta/ParameterList.cpp @@ -12,6 +12,7 @@ #include #include #include +#include ewol::widget::ParameterList::ParameterList() : signalSelect(this, "select", "") { @@ -33,10 +34,6 @@ void ewol::widget::ParameterList::init() { ewol::widget::ParameterList::~ParameterList() { //clean all the object - for (size_t iii=0; iii& _newObject, int32_t _pos) { + if (_newObject == nullptr) { EWOL_ERROR("Try to add an empty object in the Widget generic display system"); return; } @@ -64,24 +61,20 @@ void ewol::widget::ParameterList::addOObject(ewol::Compositing* _newObject, int3 } void ewol::widget::ParameterList::clearOObjectList() { - for (size_t iii=0; iiidraw(); + for (auto &it : m_listOObject) { + if (it != nullptr) { + it->draw(); } } WidgetScrolled::onDraw(); } void ewol::widget::ParameterList::onRegenerateDisplay() { - if (true == needRedraw()) { + if (needRedraw() == true) { // clean the object list ... clearOObjectList(); //EWOL_DEBUG("OnRegenerateDisplay(" << m_size.x << "," << m_size.y << ")"); @@ -116,7 +109,10 @@ void ewol::widget::ParameterList::onRegenerateDisplay() { std::vector listSizeColomn; // set background color : - ewol::compositing::Drawing * tmpDraw = new ewol::compositing::Drawing(); + ememory::SharedPtr tmpDraw = ememory::makeShared(); + if (tmpDraw == nullptr) { + return; + } tmpDraw->setColor(etk::Color<>(0xFF, 0xFF, 0xFF, 0xFF)); tmpDraw->setPos(vec3(0,0,0) ); tmpDraw->rectangleWidth(vec3(m_size.x(), m_size.y(), 0) ); @@ -138,10 +134,10 @@ void ewol::widget::ParameterList::onRegenerateDisplay() { std::string myTextToWrite = "???"; etk::Color<> fg(0x00, 0x00, 0x00, 0xFF); if (m_list[iii] != nullptr) { - myTextToWrite = m_list[iii]->m_label; + myTextToWrite = TRANSLATE(m_list[iii]->m_label); } - ewol::compositing::Text * tmpText = new ewol::compositing::Text(); + ememory::SharedPtr tmpText = ememory::makeShared(); vec3 textPos; textPos.setX((int32_t)tmpOriginX); @@ -205,33 +201,31 @@ void ewol::widget::ParameterList::onLostFocus() { } void ewol::widget::ParameterList::menuAdd(std::string& _label, int32_t _refId, std::string& _image) { - ewol::widget::elementPL* tmpEmement = new widget::elementPL(_label, _refId, _image, false); - if (nullptr != tmpEmement) { - m_list.push_back(tmpEmement); - if (m_idSelected == -1 && _label != "---" && _refId>0) { - m_idSelected = m_list.size()-1; - } - markToRedraw(); + ememory::SharedPtr tmpEmement = ememory::makeShared(_label, _refId, _image, false); + if (tmpEmement == nullptr) { + EWOL_ERROR("Can not allocacte menu parameter"); + return; } + m_list.push_back(tmpEmement); + if (m_idSelected == -1 && _label != "---" && _refId>0) { + m_idSelected = m_list.size()-1; + } + markToRedraw(); } void ewol::widget::ParameterList::menuAddGroup(std::string& _label) { std::string image = ""; - ewol::widget::elementPL* tmpEmement = new widget::elementPL(_label, -1, image, true); - if (nullptr != tmpEmement) { - m_list.push_back(tmpEmement); - markToRedraw(); + ememory::SharedPtr tmpEmement = ememory::makeShared(_label, -1, image, true); + if (tmpEmement == nullptr) { + EWOL_ERROR("Can not allocacte menu parameter"); + return; } + m_list.push_back(tmpEmement); + markToRedraw(); } void ewol::widget::ParameterList::menuClear() { m_idSelected = -1; - for (size_t iii=0; iii m_list; + std::vector> m_list; protected: ParameterList(); void init() override; @@ -50,9 +50,9 @@ namespace ewol { void setLabel(std::string _newLabel); // drawing capabilities .... private: - std::vector m_listOObject; //!< generic element to display... + std::vector> m_listOObject; //!< generic element to display... public: - void addOObject(ewol::Compositing* _newObject, int32_t _pos=-1); + void addOObject(const ememory::SharedPtr& _newObject, int32_t _pos=-1); void clearOObjectList(); // list properties ... private: diff --git a/lutin_ewol-data.py b/lutin_ewol-data.py new file mode 100644 index 00000000..1e910add --- /dev/null +++ b/lutin_ewol-data.py @@ -0,0 +1,46 @@ +#!/usr/bin/python +import lutin.debug as debug +import lutin.tools as tools + + +def get_type(): + return "LIBRARY" + +def get_desc(): + return "ewol is a widget management library" + +def get_licence(): + return "MPL-2" + +def get_compagny_type(): + return "com" + +def get_compagny_name(): + return "atria-soft" + +def get_maintainer(): + return "authors.txt" + +def get_version(): + return "version.txt" + +def configure(target, my_module): + my_module.copy_path('data/theme/shape/square/*','theme/shape/square') + my_module.copy_path('data/theme/default/*','theme/shape/square/') + my_module.copy_path('data/theme/shape/round/*','theme/shape/round') + my_module.copy_path('data/theme/color/black/*','theme/color/black') + my_module.copy_path('data/theme/color/white/*','theme/color/white') + my_module.copy_path('data/textured.*','') + my_module.copy_path('data/texturedNoMaterial.*','') + my_module.copy_path('data/text.*','') + my_module.copy_path('data/simple3D.*','') + my_module.copy_path('data/color.*','') + my_module.copy_path('data/color3.*','') + my_module.copy_path('data/textured3D2.*','') + my_module.copy_path('data/textured3D.*','') + my_module.copy_path('data/texturedDF.*','') + my_module.copy_path('data/fontDistanceField/*','fontDistanceField') + my_module.copy_path('data/translate/*','translate/ewol') + my_module.copy_path('data/ewol-gui-*.xml') + return True + diff --git a/lutin_ewol.py b/lutin_ewol.py index ce65dd9f..80127139 100644 --- a/lutin_ewol.py +++ b/lutin_ewol.py @@ -221,23 +221,6 @@ def configure(target, my_module): 'ewol/tools/message.hpp' ]) - my_module.copy_path('data/theme/shape/square/*','theme/shape/square') - my_module.copy_path('data/theme/shape/round/*','theme/shape/round') - my_module.copy_path('data/theme/color/black/*','theme/color/black') - my_module.copy_path('data/theme/color/white/*','theme/color/white') - my_module.copy_path('data/textured.*','') - my_module.copy_path('data/texturedNoMaterial.*','') - my_module.copy_path('data/text.*','') - my_module.copy_path('data/simple3D.*','') - my_module.copy_path('data/color.*','') - my_module.copy_path('data/color3.*','') - my_module.copy_path('data/textured3D2.*','') - my_module.copy_path('data/textured3D.*','') - my_module.copy_path('data/texturedDF.*','') - my_module.copy_path('data/fontDistanceField/*','fontDistanceField') - my_module.copy_path('data/translate/*','translate/ewol') - my_module.copy_path('data/ewol-gui-*.xml') - # name of the dependency my_module.add_depend([ 'elog', @@ -252,6 +235,7 @@ def configure(target, my_module): 'egami', 'edtaa3', 'etranslate', + 'ewol-data' ]) my_module.add_path(".")