Commit 18a71f62 authored by kempe's avatar kempe
Browse files

Cleanup of docked-audioplayer refactoring

parent d7b2ad00
...@@ -22,7 +22,7 @@ PullDownMenu { ...@@ -22,7 +22,7 @@ PullDownMenu {
} }
MenuItem { MenuItem {
id: actionShowPlayer id: actionShowPlayer
visible: player.isPlaying && !player.open && !hideShowPlayerAction visible: isPlaying && !player.open && !hideShowPlayerAction
text: qsTr("Show player") text: qsTr("Show player")
} }
MenuItem { MenuItem {
......
...@@ -22,7 +22,7 @@ CoverBackground { ...@@ -22,7 +22,7 @@ CoverBackground {
id: playToggle id: playToggle
iconSource: AudioPlayer.isPlaying ? "image://theme/icon-cover-pause" : "image://theme/icon-cover-play" iconSource: AudioPlayer.isPlaying ? "image://theme/icon-cover-pause" : "image://theme/icon-cover-play"
onTriggered: { onTriggered: {
if(!player.stationData) if(!window.stationData)
player.playNext() player.playNext()
else else
AudioPlayer.togglePlayback() AudioPlayer.togglePlayback()
......
import QtQuick 2.6 import QtQuick 2.6
import org.nemomobile.notifications 1.0 import org.nemomobile.notifications 1.0
import Sailfish.Silica 1.0 import Sailfish.Silica 1.0
import it.kempe.AudioPlayer 1.0
import "pages" import "pages"
import "components" import "components"
import "components/audioplayer" as Audio import "components/audioplayer" as Audio
...@@ -12,8 +13,8 @@ ApplicationWindow ...@@ -12,8 +13,8 @@ ApplicationWindow
id: window id: window
property bool loading property bool loading
property string stationIcon
property var stationData property var stationData
property bool isPlaying: AudioPlayer.isPlaying
allowedOrientations: Orientation.All allowedOrientations: Orientation.All
bottomMargin: player.visibleSize bottomMargin: player.visibleSize
......
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