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

[DEV] update new FN Node file interface

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/theme/shape/round/Button.json
View File

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

4
data/theme/shape/round/CheckBox.json
View File

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

4
data/theme/shape/round/ContextMenu.json
View File

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

4
data/theme/shape/round/Entry.json
View File

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

4
data/theme/shape/round/PopUp.json
View File

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

4
data/theme/shape/round/WidgetScrolled.json
View File

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

4
data/theme/shape/square/Button.json
View File

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

4
data/theme/shape/square/CheckBox.json
View File

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

4
data/theme/shape/square/ContextMenu.json
View File

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

4
data/theme/shape/square/Entry.json
View File

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

4
data/theme/shape/square/PopUp.json
View File

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

4
data/theme/shape/square/WidgetScrolled.json
View File

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

2
ewol/compositing/Area.cpp
View File

@ -35,7 +35,7 @@ ewol::compositing::Area::~Area() {
void ewol::compositing::Area::loadProgram() {
// get the shader resource :
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) {
m_GLPosition = m_GLprogram->getAttribute("EW_coord3d");
m_GLColor = m_GLprogram->getAttribute("EW_color");

2
ewol/compositing/Drawing.cpp
View File

@ -285,7 +285,7 @@ void ewol::compositing::Drawing::loadProgram() {
// remove previous loading ... in case
unLoadProgram();
// 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 :
if (nullptr != m_GLprogram ) {
m_GLPosition = m_GLprogram->getAttribute("EW_coord3d");

4
ewol/compositing/Image.cpp
View File

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

2
ewol/compositing/TextBase.h
View File

@ -101,7 +101,7 @@ namespace ewol {
/**
* @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
*/

2
ewol/compositing/TextDF.cpp
View File

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

2
ewol/context/ConfigFont.cpp
View File

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

2
ewol/context/Context.cpp
View File

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

2
ewol/resource/Colored3DObject.cpp
View File

@ -24,7 +24,7 @@ void ewol::resource::Colored3DObject::init() {
gale::Resource::init();
// get the shader resource :
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) {
m_GLPosition = m_GLprogram->getAttribute("EW_coord3d");
m_GLColor = m_GLprogram->getUniform("EW_color");

2
ewol/widget/Button.h
View File

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

2
ewol/widget/ButtonColor.h
View File

@ -41,7 +41,7 @@ namespace ewol {
* @param[in] _shaperName The new shaper filename.
*/
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:
DECLARE_WIDGET_FACTORY(ButtonColor, "ButtonColor");
/**

2
ewol/widget/CheckBox.h
View File

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

2
ewol/widget/ContextMenu.h
View File

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

2
ewol/widget/Entry.cpp
View File

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

2
ewol/widget/Image.cpp
View File

@ -30,7 +30,7 @@ ewol::widget::Image::Image() :
m_smooth(*this, "smooth", true, "Smooth display of the image") {
addObjectType("ewol::widget::Image");
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) {
m_colorId = m_colorProperty->request("foreground");
}

2
ewol/widget/Label.cpp
View File

@ -23,7 +23,7 @@ ewol::widget::Label::Label() :
m_colorDefaultFgText(-1),
m_colorDefaultBgText(-1){
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) {
m_colorDefaultFgText = m_colorProperty->request("foreground");
m_colorDefaultBgText = m_colorProperty->request("background");

2
ewol/widget/ListFileSystem.cpp
View File

@ -31,7 +31,7 @@ ewol::widget::ListFileSystem::ListFileSystem() :
#if defined(__TARGET_OS__Windows)
m_folder = "c:/";
#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) {
m_colorIdText = m_colorProperty->request("text");
m_colorIdBackground1 = m_colorProperty->request("background1");

2
ewol/widget/PopUp.h
View File

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

2
ewol/widget/Scroll.h
View File

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

2
ewol/widget/WidgetScrolled.h
View File

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

2
ewol/widget/Windows.cpp
View File

@ -29,7 +29,7 @@ ewol::widget::Windows::Windows() :
m_colorBg(-1) {
addObjectType("ewol::widget::Windows");
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) {
m_colorBg = m_colorProperty->request("background");
}

10
ewol/widget/meta/FileChooser.cpp
View File

@ -53,13 +53,13 @@ void ewol::widget::FileChooser::init() {
+ " <spacer expand='true,false'/>\n"
+ " <button name='[" + etk::to_string(getId()) + "]file-shooser:button-validate'>\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"
+ " </sizer>\n"
+ " </button>\n"
+ " <button name='[" + etk::to_string(getId()) + "]file-shooser:button-cancel'>\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"
+ " </sizer>\n"
+ " </button>\n"
@ -83,13 +83,13 @@ void ewol::widget::FileChooser::init() {
+ " <spacer min-size='2,2mm'/>\n"
+ " </sizer>\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"
+ " </sizer>\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"
+ " <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"
+ " <label name='[" + etk::to_string(getId()) + "]file-shooser:title-label'>" + TRANSLATE("FileChooser") + "</label>\n"
+ " </sizer>\n"

4
ewol/widget/meta/Parameter.cpp
View File

@ -72,7 +72,7 @@ void ewol::widget::Parameter::init() {
tmpButton->setSubWidget(ewol::widget::Composer::create(widget::Composer::String,
"<composer>\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"
" </sizer>\n"
"</composer>\n"));
@ -96,7 +96,7 @@ void ewol::widget::Parameter::init() {
tmpButton->setSubWidget(ewol::widget::Composer::create(widget::Composer::String,
"<composer>\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"
" </sizer>\n"
"</composer>\n"));