[DEV] update new FN Node file interface

This commit is contained in:
Edouard DUPIN 2015-09-18 22:00:53 +02:00
parent 77dc891394
commit 9bba7de644
34 changed files with 52 additions and 52 deletions

View File

@ -18,6 +18,6 @@
padding-in-buttom:1, padding-in-buttom:1,
change-time:356, change-time:356,
program:"THEME:GUI:Button.prog", program:"{ewol}THEME:GUI:Button.prog",
color:"THEME:COLOR:Button.json" color:"{ewol}THEME:COLOR:Button.json"
} }

View File

@ -6,6 +6,6 @@
padding-top:10, padding-top:10,
padding-buttom:10, padding-buttom:10,
change-time:356, change-time:356,
program:"THEME:GUI:CheckBox.prog", program:"{ewol}THEME:GUI:CheckBox.prog",
color:"THEME:COLOR:CheckBox.json" color:"{ewol}THEME:COLOR:CheckBox.json"
} }

View File

@ -18,6 +18,6 @@
padding-in-buttom:1, padding-in-buttom:1,
change-time:356, change-time:356,
program:"THEME:GUI:ContextMenu.prog", program:"{ewol}THEME:GUI:ContextMenu.prog",
color:"THEME:COLOR:ContextMenu.json" color:"{ewol}THEME:COLOR:ContextMenu.json"
} }

View File

@ -18,6 +18,6 @@
padding-in-buttom:1, padding-in-buttom:1,
change-time:356, change-time:356,
program:"THEME:GUI:Entry.prog", program:"{ewol}THEME:GUI:Entry.prog",
color:"THEME:COLOR:Entry.json" color:"{ewol}THEME:COLOR:Entry.json"
} }

View File

@ -18,6 +18,6 @@
padding-in-buttom:1, padding-in-buttom:1,
change-time:356, change-time:356,
program:"THEME:GUI:PopUp.prog", program:"{ewol}THEME:GUI:PopUp.prog",
color:"THEME:COLOR:PopUp.json" color:"{ewol}THEME:COLOR:PopUp.json"
} }

View File

@ -4,6 +4,6 @@
padding-top:16, padding-top:16,
padding-buttom:16, padding-buttom:16,
change-time:200, change-time:200,
program:"THEME:GUI:WidgetScrolled.prog", program:"{ewol}THEME:GUI:WidgetScrolled.prog",
color:"THEME:COLOR:WidgetScrolled.json" color:"{ewol}THEME:COLOR:WidgetScrolled.json"
} }

View File

@ -18,6 +18,6 @@
padding-in-buttom:1, padding-in-buttom:1,
change-time:356, change-time:356,
program:"THEME:GUI:Button.prog", program:"{ewol}THEME:GUI:Button.prog",
color:"THEME:COLOR:Button.json" color:"{ewol}THEME:COLOR:Button.json"
} }

View File

@ -20,6 +20,6 @@
box-size:20, box-size:20,
box-inside:12, box-inside:12,
change-time:356, change-time:356,
program:"THEME:GUI:CheckBox.prog", program:"{ewol}THEME:GUI:CheckBox.prog",
color:"THEME:COLOR:CheckBox.json" color:"{ewol}THEME:COLOR:CheckBox.json"
} }

View File

@ -18,6 +18,6 @@
padding-in-buttom:2, padding-in-buttom:2,
change-time:356, change-time:356,
program:"THEME:GUI:ContextMenu.prog", program:"{ewol}THEME:GUI:ContextMenu.prog",
color:"THEME:COLOR:ContextMenu.json" color:"{ewol}THEME:COLOR:ContextMenu.json"
} }

View File

@ -18,6 +18,6 @@
padding-in-buttom:2, padding-in-buttom:2,
change-time:356, change-time:356,
program:"THEME:GUI:Entry.prog", program:"{ewol}THEME:GUI:Entry.prog",
color:"THEME:COLOR:Entry.json" color:"{ewol}THEME:COLOR:Entry.json"
} }

View File

@ -18,6 +18,6 @@
padding-in-buttom:2, padding-in-buttom:2,
change-time:356, change-time:356,
program:"THEME:GUI:PopUp.prog", program:"{ewol}THEME:GUI:PopUp.prog",
color:"THEME:COLOR:PopUp.json" color:"{ewol}THEME:COLOR:PopUp.json"
} }

View File

@ -18,6 +18,6 @@
padding-in-buttom:3, padding-in-buttom:3,
change-time:200, change-time:200,
program:"THEME:GUI:WidgetScrolled.prog", program:"{ewol}THEME:GUI:WidgetScrolled.prog",
color:"THEME:COLOR:WidgetScrolled.json" color:"{ewol}THEME:COLOR:WidgetScrolled.json"
} }

View File

@ -35,7 +35,7 @@ ewol::compositing::Area::~Area() {
void ewol::compositing::Area::loadProgram() { void ewol::compositing::Area::loadProgram() {
// get the shader resource : // get the shader resource :
m_GLPosition = 0; m_GLPosition = 0;
m_GLprogram = gale::resource::Program::create(std::string("DATA:textured3D.prog")); m_GLprogram = gale::resource::Program::create(std::string("{ewol}DATA:textured3D.prog"));
if (nullptr != m_GLprogram) { if (nullptr != m_GLprogram) {
m_GLPosition = m_GLprogram->getAttribute("EW_coord3d"); m_GLPosition = m_GLprogram->getAttribute("EW_coord3d");
m_GLColor = m_GLprogram->getAttribute("EW_color"); m_GLColor = m_GLprogram->getAttribute("EW_color");

View File

@ -285,7 +285,7 @@ void ewol::compositing::Drawing::loadProgram() {
// remove previous loading ... in case // remove previous loading ... in case
unLoadProgram(); unLoadProgram();
// oad the new ... // oad the new ...
m_GLprogram = gale::resource::Program::create("DATA:color3.prog"); m_GLprogram = gale::resource::Program::create("{ewol}DATA:color3.prog");
// get the shader resource : // get the shader resource :
if (nullptr != m_GLprogram ) { if (nullptr != m_GLprogram ) {
m_GLPosition = m_GLprogram->getAttribute("EW_coord3d"); m_GLPosition = m_GLprogram->getAttribute("EW_coord3d");

View File

@ -43,9 +43,9 @@ void ewol::compositing::Image::loadProgram() {
m_GLPosition = 0; m_GLPosition = 0;
m_GLprogram.reset(); m_GLprogram.reset();
if (m_distanceFieldMode == true) { if (m_distanceFieldMode == true) {
m_GLprogram = gale::resource::Program::create("DATA:texturedDF.prog"); m_GLprogram = gale::resource::Program::create("{ewol}DATA:texturedDF.prog");
} else { } else {
m_GLprogram = gale::resource::Program::create("DATA:textured3D.prog"); m_GLprogram = gale::resource::Program::create("{ewol}DATA:textured3D.prog");
} }
if (m_GLprogram != nullptr) { if (m_GLprogram != nullptr) {
m_GLPosition = m_GLprogram->getAttribute("EW_coord3d"); m_GLPosition = m_GLprogram->getAttribute("EW_coord3d");

View File

@ -101,7 +101,7 @@ namespace ewol {
/** /**
* @brief generic constructor * @brief generic constructor
*/ */
TextBase(const std::string& _shaderName = "DATA:text.prog", bool _loadProgram = true); TextBase(const std::string& _shaderName = "{ewol}DATA:text.prog", bool _loadProgram = true);
/** /**
* @brief generic destructor * @brief generic destructor
*/ */

View File

@ -21,7 +21,7 @@ ewol::compositing::TextDF::TextDF(const std::string& _fontName, int32_t _fontSiz
m_GLglyphLevel(-1), m_GLglyphLevel(-1),
m_size(12.0) { m_size(12.0) {
setFont(_fontName, _fontSize); setFont(_fontName, _fontSize);
loadProgram("DATA:fontDistanceField/font1.prog"); loadProgram("{ewol}DATA:fontDistanceField/font1.prog");
} }

View File

@ -13,7 +13,7 @@
#define __class__ "context::ConfigFont" #define __class__ "context::ConfigFont"
ewol::context::ConfigFont::ConfigFont() : ewol::context::ConfigFont::ConfigFont() :
m_folder("DATA:fonts"), m_folder("{ewol}DATA:fonts"),
m_name("Arial;Helvetica"), m_name("Arial;Helvetica"),
m_size(10), m_size(10),
m_useExternal(false) { m_useExternal(false) {

View File

@ -70,7 +70,7 @@ void ewol::Context::inputEventUnGrabPointer() {
void ewol::Context::onCreate(gale::Context& _context) { void ewol::Context::onCreate(gale::Context& _context) {
EWOL_INFO(" == > Ewol system create (BEGIN)"); EWOL_INFO(" == > Ewol system create (BEGIN)");
// Add basic ewol translation: // Add basic ewol translation:
ewol::translate::addPath("ewol", "DATA:translate/ewol/"); ewol::translate::addPath("ewol", "{ewol}DATA:translate/ewol/");
ewol::translate::autoDetectLanguage(); ewol::translate::autoDetectLanguage();
// By default we set 2 themes (1 color and 1 shape ...) : // By default we set 2 themes (1 color and 1 shape ...) :
etk::theme::setNameDefault("GUI", "shape/square/"); etk::theme::setNameDefault("GUI", "shape/square/");

View File

@ -24,7 +24,7 @@ void ewol::resource::Colored3DObject::init() {
gale::Resource::init(); gale::Resource::init();
// get the shader resource : // get the shader resource :
m_GLPosition = 0; m_GLPosition = 0;
m_GLprogram = gale::resource::Program::create("DATA:simple3D.prog"); m_GLprogram = gale::resource::Program::create("{ewol}DATA:simple3D.prog");
if (m_GLprogram != nullptr) { if (m_GLprogram != nullptr) {
m_GLPosition = m_GLprogram->getAttribute("EW_coord3d"); m_GLPosition = m_GLprogram->getAttribute("EW_coord3d");
m_GLColor = m_GLprogram->getUniform("EW_color"); m_GLColor = m_GLprogram->getUniform("EW_color");

View File

@ -50,7 +50,7 @@ namespace ewol {
* @param[in] _shaperName Shaper file properties * @param[in] _shaperName Shaper file properties
*/ */
Button(); Button();
void init(const std::string& _shaperName="THEME:GUI:Button.json"); void init(const std::string& _shaperName="{ewol}THEME:GUI:Button.json");
public: public:
DECLARE_WIDGET_FACTORY(Button, "Button"); DECLARE_WIDGET_FACTORY(Button, "Button");
/** /**

View File

@ -41,7 +41,7 @@ namespace ewol {
* @param[in] _shaperName The new shaper filename. * @param[in] _shaperName The new shaper filename.
*/ */
ButtonColor(); ButtonColor();
void init(etk::Color<> _baseColor=etk::color::black, std::string _shaperName="THEME:GUI:Button.json"); void init(etk::Color<> _baseColor=etk::color::black, std::string _shaperName="{ewol}THEME:GUI:Button.json");
public: public:
DECLARE_WIDGET_FACTORY(ButtonColor, "ButtonColor"); DECLARE_WIDGET_FACTORY(ButtonColor, "ButtonColor");
/** /**

View File

@ -43,7 +43,7 @@ namespace ewol {
* @param[in] _shaperName Shaper file properties * @param[in] _shaperName Shaper file properties
*/ */
CheckBox(); CheckBox();
void init(const std::string& _shaperName="THEME:GUI:CheckBox.json"); void init(const std::string& _shaperName="{ewol}THEME:GUI:CheckBox.json");
public: public:
DECLARE_WIDGET_FACTORY(CheckBox, "CheckBox"); DECLARE_WIDGET_FACTORY(CheckBox, "CheckBox");
/** /**

View File

@ -33,7 +33,7 @@ namespace ewol {
}; };
protected: protected:
ContextMenu(); ContextMenu();
void init(const std::string& _shaperName="THEME:GUI:ContextMenu.json"); void init(const std::string& _shaperName="{ewol}THEME:GUI:ContextMenu.json");
public: public:
DECLARE_WIDGET_FACTORY(ContextMenu, "ContextMenu"); DECLARE_WIDGET_FACTORY(ContextMenu, "ContextMenu");
virtual ~ContextMenu(); virtual ~ContextMenu();

View File

@ -41,7 +41,7 @@ ewol::widget::Entry::Entry() :
void ewol::widget::Entry::init(const std::string& _newData) { void ewol::widget::Entry::init(const std::string& _newData) {
ewol::Widget::init(); ewol::Widget::init();
m_data.set(_newData); m_data.set(_newData);
m_shaper.setString("THEME:GUI:Entry.json"); m_shaper.setString("{ewol}THEME:GUI:Entry.json");
setCanHaveFocus(true); setCanHaveFocus(true);
try { try {

View File

@ -30,7 +30,7 @@ ewol::widget::Image::Image() :
m_smooth(*this, "smooth", true, "Smooth display of the image") { m_smooth(*this, "smooth", true, "Smooth display of the image") {
addObjectType("ewol::widget::Image"); addObjectType("ewol::widget::Image");
m_imageRenderSize = vec2(0,0); m_imageRenderSize = vec2(0,0);
m_colorProperty = ewol::resource::ColorFile::create("THEME:COLOR:Image.json"); m_colorProperty = ewol::resource::ColorFile::create("{ewol}THEME:COLOR:Image.json");
if (m_colorProperty != nullptr) { if (m_colorProperty != nullptr) {
m_colorId = m_colorProperty->request("foreground"); m_colorId = m_colorProperty->request("foreground");
} }

View File

@ -23,7 +23,7 @@ ewol::widget::Label::Label() :
m_colorDefaultFgText(-1), m_colorDefaultFgText(-1),
m_colorDefaultBgText(-1){ m_colorDefaultBgText(-1){
addObjectType("ewol::widget::Label"); addObjectType("ewol::widget::Label");
m_colorProperty = ewol::resource::ColorFile::create("THEME:COLOR:Label.json"); m_colorProperty = ewol::resource::ColorFile::create("{ewol}THEME:COLOR:Label.json");
if (m_colorProperty != nullptr) { if (m_colorProperty != nullptr) {
m_colorDefaultFgText = m_colorProperty->request("foreground"); m_colorDefaultFgText = m_colorProperty->request("foreground");
m_colorDefaultBgText = m_colorProperty->request("background"); m_colorDefaultBgText = m_colorProperty->request("background");

View File

@ -31,7 +31,7 @@ ewol::widget::ListFileSystem::ListFileSystem() :
#if defined(__TARGET_OS__Windows) #if defined(__TARGET_OS__Windows)
m_folder = "c:/"; m_folder = "c:/";
#endif #endif
m_colorProperty = ewol::resource::ColorFile::create("THEME:COLOR:ListFileSystem.json"); m_colorProperty = ewol::resource::ColorFile::create("{ewol}THEME:COLOR:ListFileSystem.json");
if (m_colorProperty != nullptr) { if (m_colorProperty != nullptr) {
m_colorIdText = m_colorProperty->request("text"); m_colorIdText = m_colorProperty->request("text");
m_colorIdBackground1 = m_colorProperty->request("background1"); m_colorIdBackground1 = m_colorProperty->request("background1");

View File

@ -31,7 +31,7 @@ namespace ewol {
* @param[in] _shaperName Shaper file properties * @param[in] _shaperName Shaper file properties
*/ */
PopUp(); PopUp();
void init(const std::string& _shaperName="THEME:GUI:PopUp.json"); void init(const std::string& _shaperName="{ewol}THEME:GUI:PopUp.json");
public: public:
DECLARE_WIDGET_FACTORY(PopUp, "PopUp"); DECLARE_WIDGET_FACTORY(PopUp, "PopUp");
/** /**

View File

@ -41,7 +41,7 @@ namespace ewol {
enum gale::key::type m_highSpeedType; enum gale::key::type m_highSpeedType;
protected: protected:
Scroll(); Scroll();
void init(const std::string& _shaperName="THEME:GUI:WidgetScrolled.json"); void init(const std::string& _shaperName="{ewol}THEME:GUI:WidgetScrolled.json");
public: public:
DECLARE_WIDGET_FACTORY(Scroll, "Scroll"); DECLARE_WIDGET_FACTORY(Scroll, "Scroll");
virtual ~Scroll(); virtual ~Scroll();

View File

@ -69,7 +69,7 @@ namespace ewol {
* @param[in] _shaperName Shaper name if the scrolled widget. * @param[in] _shaperName Shaper name if the scrolled widget.
*/ */
WidgetScrolled(); WidgetScrolled();
void init(const std::string& _shaperName="THEME:GUI:WidgetScrolled.json"); void init(const std::string& _shaperName="{ewol}THEME:GUI:WidgetScrolled.json");
public: public:
DECLARE_WIDGET_FACTORY(WidgetScrolled, "WidgetScrolled"); DECLARE_WIDGET_FACTORY(WidgetScrolled, "WidgetScrolled");
/** /**

View File

@ -29,7 +29,7 @@ ewol::widget::Windows::Windows() :
m_colorBg(-1) { m_colorBg(-1) {
addObjectType("ewol::widget::Windows"); addObjectType("ewol::widget::Windows");
setCanHaveFocus(true); setCanHaveFocus(true);
m_colorProperty = ewol::resource::ColorFile::create("THEME:COLOR:Windows.json"); m_colorProperty = ewol::resource::ColorFile::create("{ewol}THEME:COLOR:Windows.json");
if (m_colorProperty != nullptr) { if (m_colorProperty != nullptr) {
m_colorBg = m_colorProperty->request("background"); m_colorBg = m_colorProperty->request("background");
} }

View File

@ -53,13 +53,13 @@ void ewol::widget::FileChooser::init() {
+ " <spacer expand='true,false'/>\n" + " <spacer expand='true,false'/>\n"
+ " <button name='[" + etk::to_string(getId()) + "]file-shooser:button-validate'>\n" + " <button name='[" + etk::to_string(getId()) + "]file-shooser:button-validate'>\n"
+ " <sizer mode='hori'>\n" + " <sizer mode='hori'>\n"
+ " <image src='THEME:GUI:Load.edf' fill='true' size='7,7mm' distance-field='true'/>\n" + " <image src='{ewol}THEME:GUI:Load.edf' fill='true' size='7,7mm' distance-field='true'/>\n"
+ " <label name='[" + etk::to_string(getId()) + "]file-shooser:validate-label'>" + TRANSLATE("Validate") + "</label>\n" + " <label name='[" + etk::to_string(getId()) + "]file-shooser:validate-label'>" + TRANSLATE("Validate") + "</label>\n"
+ " </sizer>\n" + " </sizer>\n"
+ " </button>\n" + " </button>\n"
+ " <button name='[" + etk::to_string(getId()) + "]file-shooser:button-cancel'>\n" + " <button name='[" + etk::to_string(getId()) + "]file-shooser:button-cancel'>\n"
+ " <sizer mode='hori'>\n" + " <sizer mode='hori'>\n"
+ " <image src='THEME:GUI:Remove.edf' fill='true' size='7,7mm' distance-field='true'/>\n" + " <image src='{ewol}THEME:GUI:Remove.edf' fill='true' size='7,7mm' distance-field='true'/>\n"
+ " <label name='[" + etk::to_string(getId()) + "]file-shooser:cancel-label'>" + TRANSLATE("Cancel") + "</label>\n" + " <label name='[" + etk::to_string(getId()) + "]file-shooser:cancel-label'>" + TRANSLATE("Cancel") + "</label>\n"
+ " </sizer>\n" + " </sizer>\n"
+ " </button>\n" + " </button>\n"
@ -83,13 +83,13 @@ void ewol::widget::FileChooser::init() {
+ " <spacer min-size='2,2mm'/>\n" + " <spacer min-size='2,2mm'/>\n"
+ " </sizer>\n" + " </sizer>\n"
+ " <sizer mode='hori'>\n" + " <sizer mode='hori'>\n"
+ " <image name='[" + etk::to_string(getId()) + "]file-shooser:img-file' src='THEME:GUI:File.edf' expand='false' size='8,8mm' distance-field='true'/>\n" + " <image name='[" + etk::to_string(getId()) + "]file-shooser:img-file' src='{ewol}THEME:GUI:File.edf' expand='false' size='8,8mm' distance-field='true'/>\n"
+ " <entry name='[" + etk::to_string(getId()) + "]file-shooser:entry-file' expand='true,false' fill='true,false'/>\n" + " <entry name='[" + etk::to_string(getId()) + "]file-shooser:entry-file' expand='true,false' fill='true,false'/>\n"
+ " </sizer>\n" + " </sizer>\n"
+ " <sizer mode='hori'>\n" + " <sizer mode='hori'>\n"
+ " <image name='[" + etk::to_string(getId()) + "]file-shooser:img-folder' src='THEME:GUI:Folder.edf' expand='false' size='8,8mm' distance-field='true'/>\n" + " <image name='[" + etk::to_string(getId()) + "]file-shooser:img-folder' src='{ewol}THEME:GUI:Folder.edf' expand='false' size='8,8mm' distance-field='true'/>\n"
+ " <entry name='[" + etk::to_string(getId()) + "]file-shooser:entry-folder' expand='true,false' fill='true,false'/>\n" + " <entry name='[" + etk::to_string(getId()) + "]file-shooser:entry-folder' expand='true,false' fill='true,false'/>\n"
+ " <image name='[" + etk::to_string(getId()) + "]file-shooser:img-home' src='THEME:GUI:Home.edf' expand='false' size='8,8mm' distance-field='true'/>\n" + " <image name='[" + etk::to_string(getId()) + "]file-shooser:img-home' src='{ewol}THEME:GUI:Home.edf' expand='false' size='8,8mm' distance-field='true'/>\n"
+ " </sizer>\n" + " </sizer>\n"
+ " <label name='[" + etk::to_string(getId()) + "]file-shooser:title-label'>" + TRANSLATE("FileChooser") + "</label>\n" + " <label name='[" + etk::to_string(getId()) + "]file-shooser:title-label'>" + TRANSLATE("FileChooser") + "</label>\n"
+ " </sizer>\n" + " </sizer>\n"

View File

@ -72,7 +72,7 @@ void ewol::widget::Parameter::init() {
tmpButton->setSubWidget(ewol::widget::Composer::create(widget::Composer::String, tmpButton->setSubWidget(ewol::widget::Composer::create(widget::Composer::String,
"<composer>\n" "<composer>\n"
" <sizer mode=\"hori\">\n" " <sizer mode=\"hori\">\n"
" <image src=\"THEME:GUI:Save.svg\" expand=\"true\" size=\"8,8mm\"/>\n" " <image src=\"{ewol}THEME:GUI:Save.svg\" expand=\"true\" size=\"8,8mm\"/>\n"
" <label>Save</label>\n" " <label>Save</label>\n"
" </sizer>\n" " </sizer>\n"
"</composer>\n")); "</composer>\n"));
@ -96,7 +96,7 @@ void ewol::widget::Parameter::init() {
tmpButton->setSubWidget(ewol::widget::Composer::create(widget::Composer::String, tmpButton->setSubWidget(ewol::widget::Composer::create(widget::Composer::String,
"<composer>\n" "<composer>\n"
" <sizer mode=\"hori\">\n" " <sizer mode=\"hori\">\n"
" <image src=\"THEME:GUI:Remove.svg\" expand=\"true\" size=\"8,8mm\"/>\n" " <image src=\"{ewol}THEME:GUI:Remove.svg\" expand=\"true\" size=\"8,8mm\"/>\n"
" <label>Close</label>\n" " <label>Close</label>\n"
" </sizer>\n" " </sizer>\n"
"</composer>\n")); "</composer>\n"));