From e02f711d66af993bb5e3bf4fb8675300552f10cb Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 9 Oct 2018 23:03:07 +0200 Subject: [PATCH] [DEV] update new URI --- tools/player-video/appl/Windows.cpp | 2 +- tools/player-video/appl/widget/Connection.cpp | 2 +- tools/player-video/appl/widget/ListViewer.cpp | 18 +++++------ tools/player-video/appl/widget/Player.cpp | 2 +- tools/player-video/appl/widget/UpBar.cpp | 4 +-- .../player-video/appl/widget/VideoPlayer.cpp | 2 +- tools/player-video/data/gui-light.xml | 2 +- tools/player-video/data/gui-player.xml | 8 ++--- tools/player-video/data/gui-volume.xml | 2 +- tools/player-video/data/gui.xml | 30 +++++++++---------- tools/server-remote/appl/Windows.cpp | 2 +- .../server-remote/appl/widget/Connection.cpp | 2 +- 12 files changed, 38 insertions(+), 38 deletions(-) diff --git a/tools/player-video/appl/Windows.cpp b/tools/player-video/appl/Windows.cpp index 17e26be..337a1b8 100644 --- a/tools/player-video/appl/Windows.cpp +++ b/tools/player-video/appl/Windows.cpp @@ -76,7 +76,7 @@ void appl::Windows::init() { APPL_CRITICAL(" An error occured ... in the windows creatrion ..."); return; } - m_composer->loadFromFile("DATA:gui.xml"); + m_composer->loadFromFile("DATA:///gui.xml"); setSubWidget(m_composer); drawWidgetTree(); diff --git a/tools/player-video/appl/widget/Connection.cpp b/tools/player-video/appl/widget/Connection.cpp index a1160a0..173eb15 100644 --- a/tools/player-video/appl/widget/Connection.cpp +++ b/tools/player-video/appl/widget/Connection.cpp @@ -32,7 +32,7 @@ appl::widget::Connection::Connection() : void appl::widget::Connection::init() { ewol::widget::Composer::init(); - loadFromFile("DATA:gui-connection.xml", getId()); + loadFromFile("DATA:///gui-connection.xml", getId()); subBind(ewol::widget::Entry, "[" + etk::toString(getId()) + "]connect-login", signalModify, sharedFromThis(), &appl::widget::Connection::onCallbackEntryLoginChangeValue); subBind(ewol::widget::Entry, "[" + etk::toString(getId()) + "]connect-password", signalModify, sharedFromThis(), &appl::widget::Connection::onCallbackEntryPasswordChangeValue); subBind(ewol::widget::Button, "[" + etk::toString(getId()) + "]connect-bt", signalPressed, sharedFromThis(), &appl::widget::Connection::onCallbackButtonValidate); diff --git a/tools/player-video/appl/widget/ListViewer.cpp b/tools/player-video/appl/widget/ListViewer.cpp index f7e6730..829944f 100644 --- a/tools/player-video/appl/widget/ListViewer.cpp +++ b/tools/player-video/appl/widget/ListViewer.cpp @@ -37,8 +37,8 @@ appl::widget::ListViewer::ListViewer() : void appl::widget::ListViewer::init() { ewol::Widget::init(); markToRedraw(); - //m_compImageVideo.setSource("DATA:Video.svg", 128); - //m_compImageAudio.setSource("DATA:MusicNote.svg", 128); + //m_compImageVideo.setSource("DATA:///Video.svg", 128); + //m_compImageAudio.setSource("DATA:///MusicNote.svg", 128); } appl::widget::ListViewer::~ListViewer() { @@ -310,10 +310,10 @@ void appl::ElementProperty::loadData() { tmpProperty->m_mineType = _value; if (etk::start_with(tmpProperty->m_mineType, "video") == true) { // TODO : Optimise this ... - tmpProperty->m_thumb = egami::load("DATA:Video.svg", ivec2(128,128)); + tmpProperty->m_thumb = egami::load("DATA:///Video.svg", ivec2(128,128)); } else if (etk::start_with(tmpProperty->m_mineType, "audio") == true) { // TODO : Optimise this ... - tmpProperty->m_thumb = egami::load("DATA:MusicNote.svg", ivec2(128,128)); + tmpProperty->m_thumb = egami::load("DATA:///MusicNote.svg", ivec2(128,128)); } } m_widget->markToRedraw(); @@ -819,7 +819,7 @@ void appl::ElementDisplayed::generateDisplay(vec2 _startPos, vec2 _size) { bool haveThumb = false; if (m_property->LoadDataEnded() == false) { haveThumb = false; - m_image.setSource("DATA:Home.svg", 128); + m_image.setSource("DATA:///Home.svg", 128); } else { ethread::UniqueLock lock(m_property->m_mutex); if (m_property->m_thumbPresent == true) { @@ -829,12 +829,12 @@ void appl::ElementDisplayed::generateDisplay(vec2 _startPos, vec2 _size) { m_image.print(vec2(_size.y(), _size.y())); } else { if (etk::start_with(m_property->m_mineType, "video") == true) { - m_image.setSource("DATA:Video.svg", 128); + m_image.setSource("DATA:///Video.svg", 128); } else if (etk::start_with(m_property->m_mineType, "audio") == true) { - m_image.setSource("DATA:MusicNote.svg", 128); + m_image.setSource("DATA:///MusicNote.svg", 128); } else { APPL_DEBUG("Set image: Unknow type '" << m_property->m_mineType << "'"); - m_image.setSource("DATA:Home.svg", 128); + m_image.setSource("DATA:///Home.svg", 128); } } } @@ -856,7 +856,7 @@ void appl::ElementDisplayed::generateDisplay(vec2 _startPos, vec2 _size) { } } if (haveThumb == false) { - m_image.setSource("DATA:Home.svg", 128); + m_image.setSource("DATA:///Home.svg", 128); m_image.setPos(_startPos+vec2(10,10)); m_image.print(vec2(_size.y(), _size.y())-vec2(20,20)); } diff --git a/tools/player-video/appl/widget/Player.cpp b/tools/player-video/appl/widget/Player.cpp index 387a5e9..d319759 100644 --- a/tools/player-video/appl/widget/Player.cpp +++ b/tools/player-video/appl/widget/Player.cpp @@ -35,7 +35,7 @@ appl::widget::Player::Player() : void appl::widget::Player::init() { ewol::widget::Composer::init(); if (*propertySubFile == "") { - propertySubFile.set("DATA:gui-player.xml"); + propertySubFile.set("DATA:///gui-player.xml"); } subBind(ewol::widget::Button, "[" + etk::toString(getId()) + "]appl-player-bt-previous", signalPressed, sharedFromThis(), &appl::widget::Player::onCallbackButtonPrevious); subBind(ewol::widget::Button, "[" + etk::toString(getId()) + "]appl-player-bt-play", signalValue, sharedFromThis(), &appl::widget::Player::onCallbackButtonPlay); diff --git a/tools/player-video/appl/widget/UpBar.cpp b/tools/player-video/appl/widget/UpBar.cpp index 76e5f11..1906aed 100644 --- a/tools/player-video/appl/widget/UpBar.cpp +++ b/tools/player-video/appl/widget/UpBar.cpp @@ -42,9 +42,9 @@ void appl::widget::UpBar::init() { ewol::widget::Composer::init(); if (*propertySubFile == "") { if (*propertyType == "volume") { - propertySubFile.set("DATA:gui-volume.xml"); + propertySubFile.set("DATA:///gui-volume.xml"); } else if (*propertyType == "light") { - propertySubFile.set("DATA:gui-light.xml"); + propertySubFile.set("DATA:///gui-light.xml"); } else { APPL_ERROR("can not set the mode of upBar"); } diff --git a/tools/player-video/appl/widget/VideoPlayer.cpp b/tools/player-video/appl/widget/VideoPlayer.cpp index 13f25b9..3c12665 100644 --- a/tools/player-video/appl/widget/VideoPlayer.cpp +++ b/tools/player-video/appl/widget/VideoPlayer.cpp @@ -71,7 +71,7 @@ void appl::widget::VideoDisplay::loadProgram() { // get the shader resource: m_GLPosition = 0; m_GLprogram.reset(); - m_GLprogram = gale::resource::Program::create("{ewol}DATA:textured3D.prog"); + m_GLprogram = gale::resource::Program::create("DATA:///textured3D.prog?lib=ewol"); if (m_GLprogram != null) { m_GLPosition = m_GLprogram->getAttribute("EW_coord3d"); m_GLColor = m_GLprogram->getAttribute("EW_color"); diff --git a/tools/player-video/data/gui-light.xml b/tools/player-video/data/gui-light.xml index 9853b1d..67b0fea 100644 --- a/tools/player-video/data/gui-light.xml +++ b/tools/player-video/data/gui-light.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/tools/player-video/data/gui-player.xml b/tools/player-video/data/gui-player.xml index ee52939..79eef97 100644 --- a/tools/player-video/data/gui-player.xml +++ b/tools/player-video/data/gui-player.xml @@ -6,19 +6,19 @@ diff --git a/tools/player-video/data/gui-volume.xml b/tools/player-video/data/gui-volume.xml index cc26048..8b203b3 100644 --- a/tools/player-video/data/gui-volume.xml +++ b/tools/player-video/data/gui-volume.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/tools/player-video/data/gui.xml b/tools/player-video/data/gui.xml index 1ccabd3..34dd334 100644 --- a/tools/player-video/data/gui.xml +++ b/tools/player-video/data/gui.xml @@ -15,10 +15,10 @@ - - - - + + + + @@ -27,48 +27,48 @@ - + - + - + diff --git a/tools/server-remote/appl/Windows.cpp b/tools/server-remote/appl/Windows.cpp index 185b4d2..6f9b4ee 100644 --- a/tools/server-remote/appl/Windows.cpp +++ b/tools/server-remote/appl/Windows.cpp @@ -73,7 +73,7 @@ void appl::Windows::init() { APPL_CRITICAL(" An error occured ... in the windows creatrion ..."); return; } - m_composer->loadFromFile("DATA:gui.xml"); + m_composer->loadFromFile("DATA:///gui.xml"); setSubWidget(m_composer); subBind(ewol::widget::Button, "appl-shutdown", signalPressed, sharedFromThis(), &appl::Windows::onCallbackShutdown); diff --git a/tools/server-remote/appl/widget/Connection.cpp b/tools/server-remote/appl/widget/Connection.cpp index f83eefb..c786044 100644 --- a/tools/server-remote/appl/widget/Connection.cpp +++ b/tools/server-remote/appl/widget/Connection.cpp @@ -32,7 +32,7 @@ appl::widget::Connection::Connection() : void appl::widget::Connection::init() { ewol::widget::Composer::init(); - loadFromFile("DATA:gui-connection.xml", getId()); + loadFromFile("DATA:///gui-connection.xml", getId()); subBind(ewol::widget::Entry, "[" + etk::toString(getId()) + "]connect-login", signalModify, sharedFromThis(), &appl::widget::Connection::onCallbackEntryLoginChangeValue); subBind(ewol::widget::Entry, "[" + etk::toString(getId()) + "]connect-password", signalModify, sharedFromThis(), &appl::widget::Connection::onCallbackEntryPasswordChangeValue); subBind(ewol::widget::Button, "[" + etk::toString(getId()) + "]connect-bt", signalPressed, sharedFromThis(), &appl::widget::Connection::onCallbackButtonValidate);