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

[DEV] update new URI

Browse Source
This commit is contained in:
Edouard DUPIN 2018-10-09 23:03:07 +02:00
parent 30c36d9bc1
commit e02f711d66
12 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/player-video/appl/Windows.cpp
View File

@ -76,7 +76,7 @@ void appl::Windows::init() {
APPL_CRITICAL(" An error occured ... in the windows creatrion ..."); APPL_CRITICAL(" An error occured ... in the windows creatrion ...");
return; return;
} }
m_composer->loadFromFile("DATA:gui.xml"); m_composer->loadFromFile("DATA:///gui.xml");
setSubWidget(m_composer); setSubWidget(m_composer);
drawWidgetTree(); drawWidgetTree();

2
tools/player-video/appl/widget/Connection.cpp
View File

@ -32,7 +32,7 @@ appl::widget::Connection::Connection() :
void appl::widget::Connection::init() { void appl::widget::Connection::init() {
ewol::widget::Composer::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-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::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); subBind(ewol::widget::Button, "[" + etk::toString(getId()) + "]connect-bt", signalPressed, sharedFromThis(), &appl::widget::Connection::onCallbackButtonValidate);

18
tools/player-video/appl/widget/ListViewer.cpp
View File

@ -37,8 +37,8 @@ appl::widget::ListViewer::ListViewer() :
void appl::widget::ListViewer::init() { void appl::widget::ListViewer::init() {
ewol::Widget::init(); ewol::Widget::init();
markToRedraw(); markToRedraw();
//m_compImageVideo.setSource("DATA:Video.svg", 128); //m_compImageVideo.setSource("DATA:///Video.svg", 128);
//m_compImageAudio.setSource("DATA:MusicNote.svg", 128); //m_compImageAudio.setSource("DATA:///MusicNote.svg", 128);
} }
appl::widget::ListViewer::~ListViewer() { appl::widget::ListViewer::~ListViewer() {
@ -310,10 +310,10 @@ void appl::ElementProperty::loadData() {
tmpProperty->m_mineType = _value; tmpProperty->m_mineType = _value;
if (etk::start_with(tmpProperty->m_mineType, "video") == true) { if (etk::start_with(tmpProperty->m_mineType, "video") == true) {
// TODO : Optimise this ... // 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) { } else if (etk::start_with(tmpProperty->m_mineType, "audio") == true) {
// TODO : Optimise this ... // 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(); m_widget->markToRedraw();
@ -819,7 +819,7 @@ void appl::ElementDisplayed::generateDisplay(vec2 _startPos, vec2 _size) {
bool haveThumb = false; bool haveThumb = false;
if (m_property->LoadDataEnded() == false) { if (m_property->LoadDataEnded() == false) {
haveThumb = false; haveThumb = false;
m_image.setSource("DATA:Home.svg", 128); m_image.setSource("DATA:///Home.svg", 128);
} else { } else {
ethread::UniqueLock lock(m_property->m_mutex); ethread::UniqueLock lock(m_property->m_mutex);
if (m_property->m_thumbPresent == true) { 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())); m_image.print(vec2(_size.y(), _size.y()));
} else { } else {
if (etk::start_with(m_property->m_mineType, "video") == true) { 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) { } 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 { } else {
APPL_DEBUG("Set image: Unknow type '" << m_property->m_mineType << "'"); 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) { 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.setPos(_startPos+vec2(10,10));
m_image.print(vec2(_size.y(), _size.y())-vec2(20,20)); m_image.print(vec2(_size.y(), _size.y())-vec2(20,20));
} }

2
tools/player-video/appl/widget/Player.cpp
View File

@ -35,7 +35,7 @@ appl::widget::Player::Player() :
void appl::widget::Player::init() { void appl::widget::Player::init() {
ewol::widget::Composer::init(); ewol::widget::Composer::init();
if (*propertySubFile == "") { 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-previous", signalPressed, sharedFromThis(), &appl::widget::Player::onCallbackButtonPrevious);
subBind(ewol::widget::Button, "[" + etk::toString(getId()) + "]appl-player-bt-play", signalValue, sharedFromThis(), &appl::widget::Player::onCallbackButtonPlay); subBind(ewol::widget::Button, "[" + etk::toString(getId()) + "]appl-player-bt-play", signalValue, sharedFromThis(), &appl::widget::Player::onCallbackButtonPlay);

4
tools/player-video/appl/widget/UpBar.cpp
View File

@ -42,9 +42,9 @@ void appl::widget::UpBar::init() {
ewol::widget::Composer::init(); ewol::widget::Composer::init();
if (*propertySubFile == "") { if (*propertySubFile == "") {
if (*propertyType == "volume") { if (*propertyType == "volume") {
propertySubFile.set("DATA:gui-volume.xml"); propertySubFile.set("DATA:///gui-volume.xml");
} else if (*propertyType == "light") { } else if (*propertyType == "light") {
propertySubFile.set("DATA:gui-light.xml"); propertySubFile.set("DATA:///gui-light.xml");
} else { } else {
APPL_ERROR("can not set the mode of upBar"); APPL_ERROR("can not set the mode of upBar");
} }

2
tools/player-video/appl/widget/VideoPlayer.cpp
View File

@ -71,7 +71,7 @@ void appl::widget::VideoDisplay::loadProgram() {
// get the shader resource: // get the shader resource:
m_GLPosition = 0; m_GLPosition = 0;
m_GLprogram.reset(); 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) { if (m_GLprogram != null) {
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");

2
tools/player-video/data/gui-light.xml
View File

@ -1,5 +1,5 @@
<sizer mode="vert" fill="true" expand="false,true" gravity="left"> <sizer mode="vert" fill="true" expand="false,true" gravity="left">
<image name="[{ID}]appl-upbar-image" src="DATA:Light.svg" size="8,8mm"/> <image name="[{ID}]appl-upbar-image" src="DATA:///Light.svg" size="8,8mm"/>
<appl_VolumeBar name="[{ID}]appl-upbar-range" expand="false,true" fill="true" step="5" min="0" max="200" danger="101" value="100" mode="vert"/> <appl_VolumeBar name="[{ID}]appl-upbar-range" expand="false,true" fill="true" step="5" min="0" max="200" danger="101" value="100" mode="vert"/>
<label name="[{ID}]appl-upbar-label">100%</label> <label name="[{ID}]appl-upbar-label">100%</label>
</sizer> </sizer>

8
tools/player-video/data/gui-player.xml
View File

@ -6,19 +6,19 @@
<spacer expand="true,false" fill="true"/> <spacer expand="true,false" fill="true"/>
<button name="[{ID}]appl-player-bt-previous" shape=""> <button name="[{ID}]appl-player-bt-previous" shape="">
<!--<label>_T{Previous}</label>--> <!--<label>_T{Previous}</label>-->
<image src="DATA:Previous.svg" size="8,8mm"/> <image src="DATA:///Previous.svg" size="8,8mm"/>
</button> </button>
<spacer expand="true,false" fill="true"/> <spacer expand="true,false" fill="true"/>
<button name="[{ID}]appl-player-bt-play" toggle="true" shape=""> <button name="[{ID}]appl-player-bt-play" toggle="true" shape="">
<!--<label>_T{Play}</label>--> <!--<label>_T{Play}</label>-->
<image src="DATA:Play.svg" size="8,8mm"/> <image src="DATA:///Play.svg" size="8,8mm"/>
<!--<label>_T{Pause}</label>--> <!--<label>_T{Pause}</label>-->
<image src="DATA:Suspend.svg" size="8,8mm"/> <image src="DATA:///Suspend.svg" size="8,8mm"/>
</button> </button>
<spacer expand="true,false" fill="true"/> <spacer expand="true,false" fill="true"/>
<button name="[{ID}]appl-player-bt-next" shape=""> <button name="[{ID}]appl-player-bt-next" shape="">
<!--<label>_T{Next}</label>--> <!--<label>_T{Next}</label>-->
<image src="DATA:Next.svg" size="8,8mm" /> <image src="DATA:///Next.svg" size="8,8mm" />
</button> </button>
<spacer expand="true,false" fill="true"/> <spacer expand="true,false" fill="true"/>
<spacer expand="true,false" fill="true"/> <spacer expand="true,false" fill="true"/>

2
tools/player-video/data/gui-volume.xml
View File

@ -1,5 +1,5 @@
<sizer mode="vert" fill="true" expand="false,true" gravity="right"> <sizer mode="vert" fill="true" expand="false,true" gravity="right">
<image name="[{ID}]appl-upbar-image" src="DATA:Volume.svg" size="8,8mm" fill="true" expand="true,false"/> <image name="[{ID}]appl-upbar-image" src="DATA:///Volume.svg" size="8,8mm" fill="true" expand="true,false"/>
<appl_VolumeBar name="[{ID}]appl-upbar-range" expand="false,true" fill="true" step="0.3" value="0" min="-40" danger="0.2" max="6" mode="vert"/> <appl_VolumeBar name="[{ID}]appl-upbar-range" expand="false,true" fill="true" step="0.3" value="0" min="-40" danger="0.2" max="6" mode="vert"/>
<label name="[{ID}]appl-upbar-label">0dB</label> <label name="[{ID}]appl-upbar-label">0dB</label>
</sizer> </sizer>

30
tools/player-video/data/gui.xml
View File

@ -15,10 +15,10 @@
</wslider> </wslider>
<sizer mode="hori" fill="true,false" expand="true,false" lock="true"> <sizer mode="hori" fill="true,false" expand="true,false" lock="true">
<menu name="menu-bar"> <menu name="menu-bar">
<elem title="" image="DATA:List.svg" event=""> <elem title="" image="DATA:///List.svg" event="">
<elem title="_T{Connect}" image="DATA:Connect.svg" event="menu:connect"/> <elem title="_T{Connect}" image="DATA:///Connect.svg" event="menu:connect"/>
<elem title="_T{Home}" image="DATA:Home.svg" event="menu:home"/> <elem title="_T{Home}" image="DATA:///Home.svg" event="menu:home"/>
<elem title="_T{Group}" image="DATA:Group.svg" event="menu:group"> <elem title="_T{Group}" image="DATA:///Group.svg" event="menu:group">
<elem title="_T{Films}" image="" event="menu:films"/> <elem title="_T{Films}" image="" event="menu:films"/>
<elem title="_T{Annimated films}" image="" event="menu:animation-films"/> <elem title="_T{Annimated films}" image="" event="menu:animation-films"/>
<elem title="_T{TV Show}" image="" event="menu:tv-show"/> <elem title="_T{TV Show}" image="" event="menu:tv-show"/>
@ -27,48 +27,48 @@
<elem title="_T{One-man show}" image="" event="menu:one-man-show"/> <elem title="_T{One-man show}" image="" event="menu:one-man-show"/>
<elem title="_T{Courses}" image="" event="menu:courses"/> <elem title="_T{Courses}" image="" event="menu:courses"/>
</elem> </elem>
<elem title="_T{TV}" image="DATA:Tv.svg" event="menu:tv"> <elem title="_T{TV}" image="DATA:///Tv.svg" event="menu:tv">
<elem title="_T{Child TV}" image="" event="menu:TV-child"/> <elem title="_T{Child TV}" image="" event="menu:TV-child"/>
<elem title="_T{Adult TV}" image="" event="menu:TV-adult"/> <elem title="_T{Adult TV}" image="" event="menu:TV-adult"/>
</elem> </elem>
<!-- <!--
<separator/> <separator/>
<elem title="_T{Child Adult Switch}" image="DATA:ChildAdult.svg" event="menu:child-adult-switch"/> <elem title="_T{Child Adult Switch}" image="DATA:///ChildAdult.svg" event="menu:child-adult-switch"/>
--> -->
<separator/> <separator/>
<elem title="_T{Full screen}" image="DATA:FullScreen.svg" event="menu:full-screen"/> <elem title="_T{Full screen}" image="DATA:///FullScreen.svg" event="menu:full-screen"/>
<separator/> <separator/>
<elem title="_T{Exit}" image="DATA:Exit.svg" event="menu:exit"/> <elem title="_T{Exit}" image="DATA:///Exit.svg" event="menu:exit"/>
</elem> </elem>
</menu> </menu>
<spacer expand="true,false"/> <spacer expand="true,false"/>
<button name="access-fast-back" shape=""> <button name="access-fast-back" shape="">
<image src="DATA:Back.svg" size="8,8mm" /> <image src="DATA:///Back.svg" size="8,8mm" />
</button> </button>
<spacer expand="true,false"/> <spacer expand="true,false"/>
<button name="access-fast-home" shape=""> <button name="access-fast-home" shape="">
<image src="DATA:Home.svg" size="8,8mm" /> <image src="DATA:///Home.svg" size="8,8mm" />
</button> </button>
<spacer expand="true,false"/> <spacer expand="true,false"/>
<button name="access-fast-group" shape=""> <button name="access-fast-group" shape="">
<image src="DATA:Group.svg" size="8,8mm" /> <image src="DATA:///Group.svg" size="8,8mm" />
</button> </button>
<spacer expand="true,false"/> <spacer expand="true,false"/>
<!-- <!--
<button name="access-fast-tv"> <button name="access-fast-tv">
<image src="DATA:Tv.svg" size="8,8mm" /> <image src="DATA:///Tv.svg" size="8,8mm" />
</button> </button>
<spacer expand="true,false"/> <spacer expand="true,false"/>
<button name="access-fast-page-previous"> <button name="access-fast-page-previous">
<image src="DATA:Previous.svg" size="8,8mm" /> <image src="DATA:///Previous.svg" size="8,8mm" />
</button> </button>
<spacer expand="true,false"/> <spacer expand="true,false"/>
<button name="access-fast-page-next"> <button name="access-fast-page-next">
<image src="DATA:Next.svg" size="8,8mm" /> <image src="DATA:///Next.svg" size="8,8mm" />
</button> </button>
<spacer expand="true,false"/> <spacer expand="true,false"/>
<button name="search-bt" shape=""> <button name="search-bt" shape="">
<image src="DATA:Search.svg" size='8,8mm' /> <image src="DATA:///Search.svg" size='8,8mm' />
</button> </button>
--> -->
</sizer> </sizer>

2
tools/server-remote/appl/Windows.cpp
View File

@ -73,7 +73,7 @@ void appl::Windows::init() {
APPL_CRITICAL(" An error occured ... in the windows creatrion ..."); APPL_CRITICAL(" An error occured ... in the windows creatrion ...");
return; return;
} }
m_composer->loadFromFile("DATA:gui.xml"); m_composer->loadFromFile("DATA:///gui.xml");
setSubWidget(m_composer); setSubWidget(m_composer);
subBind(ewol::widget::Button, "appl-shutdown", signalPressed, sharedFromThis(), &appl::Windows::onCallbackShutdown); subBind(ewol::widget::Button, "appl-shutdown", signalPressed, sharedFromThis(), &appl::Windows::onCallbackShutdown);

2
tools/server-remote/appl/widget/Connection.cpp
View File

@ -32,7 +32,7 @@ appl::widget::Connection::Connection() :
void appl::widget::Connection::init() { void appl::widget::Connection::init() {
ewol::widget::Composer::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-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::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); subBind(ewol::widget::Button, "[" + etk::toString(getId()) + "]connect-bt", signalPressed, sharedFromThis(), &appl::widget::Connection::onCallbackButtonValidate);