Commit 353ea12d authored by Langston Ball's avatar Langston Ball

refs #1108 - fix issue with broken broadcast media screen.

parent fee90f43
......@@ -7,56 +7,57 @@ Panel{
id:media_playback_base_panel
headerTitle: manager.translateMediaType(manager.i_current_mediaType)
buttonContent:[
StyledButton{
id:resend
height:Style.appNavigation_panelHeight
buttonText: qsTr("Resend AV", "Resend AV Commands")
onActivated: manager.currentScreen="Screen_38.qml"
},
StyledButton{
id:power_btn
height:Style.appNavigation_panelHeight
buttonText: qsTr("Power Off", "Turn off Device")
onConfirm:{
manager.exitMediaMenu()
manager.stopMedia()
}
},
StyledButton{
id:options
height:Style.appNavigation_panelHeight
buttonText: contentItem.state==="options" ? "Remote" : qsTr("Options")
onActivated: {
if(contentItem.state==="options"){
contentItem.resetState()
} else {
contentItem.state="options"
Component{
id:broadcastBtns
Row{
width: children.length*Style.appButtonWidth
height:parent.height
StyledButton{
id:resend
height:Style.appNavigation_panelHeight
buttonText: qsTr("Resend AV", "Resend AV Commands")
onActivated: manager.currentScreen="Screen_38.qml"
}
}
},
StyledButton{
id:btns
height:Style.appNavigation_panelHeight
buttonText: qsTr("Buttons", "Additional Tv Buttons")
onActivated: {
if(contentItem.state=="buttongrid"){
contentItem.resetState()
}else {
contentItem.state="buttongrid"
StyledButton{
id:power_btn
height:Style.appNavigation_panelHeight
buttonText: qsTr("Power Off", "Turn off Device")
onConfirm:{
manager.exitMediaMenu()
manager.stopMedia()
}
}
}
}
StyledButton{
id:options
height:Style.appNavigation_panelHeight
buttonText: contentItem.state==="options" ? "Remote" : qsTr("Options")
onActivated: {
if(contentItem.state==="options"){
contentItem.resetState()
} else {
contentItem.state="options"
}
}
}
StyledButton{
id:btns
height:Style.appNavigation_panelHeight
buttonText: qsTr("Buttons", "Additional Tv Buttons")
onActivated: {
if(contentItem.state=="buttongrid"){
contentItem.resetState()
}else {
contentItem.state="buttongrid"
}
}
}
}
}
]
content: Item{
anchors.fill: parent
......@@ -101,6 +102,7 @@ Panel{
manager.setBoundStatus(true)
forceActiveFocus()
resetState()
buttonControls = broadcastBtns
}
Connections{
target: manager
......
......@@ -17,8 +17,6 @@ Item{
qmlPlayer.checkMetaData()
}
function prepareMedia(mediaUrl){
processLabel.text="Please Wait, pre-processing media for mobile device."
// var url = String(mediaUrl).replace("qOrbiterGenerator.php?id=/home/public/data/", "media");
......@@ -66,8 +64,6 @@ Item{
}
/* TODO Add reconnect handler in cpp and here */
/* TODO Change android url to streaming url, generic for other devices. */
onPluginUrlChanged:{
......@@ -166,7 +162,7 @@ Item{
if(String(artist).length==0)
artist=qsTr("Unknown Artist")
lmceData.playbackInfoUpdated(title, qmlPlayer.metaData.publisher, qmlPlayer.metaData.albumArtist, 54)
lmceData.playbackInfoUpdated(title, "",artist, 54)
// lmceData.pluginNotifyStart(
// String("\nTitle: "+qmlPlayer.metaData.title+"\t"),
......
......@@ -5,13 +5,14 @@ Panel{
id:fp_panel
headerTitle:qsTr("Floorplan")
buttonContent:[
buttonControls:[
StyledButton{
buttonText: qsTr("Show List")
height: Style.appNavigation_panelHeight
onActivated:{
outerContainer.state="list"
}
},
GenericListModel{
id:pageView
......
import QtQuick 2.4
import QtQuick 2.2
QtObject{
id:applicationStyle
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment