Commit e72b198a authored by Camilo Higuita's avatar Camilo Higuita

Merge branch 'master' of git.kde.org:vvave

parents 00b34a0e 68985c0f
breeze-icons @ dc7909de
Subproject commit a54611fafe2c47d2f2ff2bbe21dbcf234a855ec2
Subproject commit dc7909ded2d29e27956f6df0a61fc10d890ba2c6
......@@ -3,4 +3,4 @@
# This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
sdk.dir=/opt/android-sdk
sdk.dir=/home/camilo/Android/Sdk
......@@ -14,6 +14,7 @@ Comment[x-test]=xxTiny Music Playerxx
Name=vvave
Name[ca]=vvave
Name[ca@valencia]=vvave
Name[en_GB]=vvave
Name[gl]=vvave
Name[nl]=vvave
Name[pt]=vvave
......@@ -24,6 +25,7 @@ Name[x-test]=xxvvavexx
Name=vvave...
Name[ca]=vvave...
Name[ca@valencia]=vvave...
Name[en_GB]=vvave...
Name[gl]=vvave…
Name[nl]=vvave...
Name[pt]=vvave...
......
......@@ -2,6 +2,7 @@
Name=vvave
Name[ca]=vvave
Name[ca@valencia]=vvave
Name[en_GB]=vvave
Name[gl]=vvave
Name[nl]=vvave
Name[pt]=vvave
......
......@@ -8,6 +8,8 @@ ItemDelegate
{
id: babeAlbumRoot
property int itemWidth : albumSize
property int itemHeight: albumSize
property int albumSize : iconSizes.huge
property int albumRadius : 0
property bool albumCard : true
......@@ -16,11 +18,29 @@ ItemDelegate
property bool showLabels : true
property bool showIndicator : false
property bool isCurrentListItem : ListView.isCurrentItem
property bool hideRepeated : false
property color labelColor : GridView.isCurrentItem || hovered || down ? highlightColor : textColor
// height: typeof album === 'undefined' ? parseInt(albumSize+(albumSize*0.3)) : parseInt(albumSize+(albumSize*0.4))
visible: !hide
readonly property bool sameAlbum :
{
if(hideRepeated)
{
if(albumsRollRoot.model.get(index-1))
{
if(albumsRollRoot.model.get(index-1).album === album && albumsRollRoot.model.get(index-1).artist === artist)
true
else
false
}else false
}else false
}
height: visible ? itemHeight : 0
width : visible ? itemWidth : 0
visible: !sameAlbum
hoverEnabled: !isMobile
// spacing: 0
......@@ -110,10 +130,10 @@ ItemDelegate
Rectangle
{
visible : showIndicator && isCurrentListItem
visible : showIndicator && currentTrackIndex === index
height: parent.height * 0.1
width: parent.width * 0.1
height: img.height * 0.1
width: img.width * 0.1
anchors.bottom: parent.bottom
anchors.bottomMargin: space.big
anchors.horizontalCenter:parent.horizontalCenter
......@@ -129,8 +149,6 @@ ItemDelegate
playing: parent.visible
}
}
}
Item
......@@ -192,6 +210,3 @@ ItemDelegate
}
}
}
......@@ -22,6 +22,7 @@ BabeList
property bool trackRating
property bool allowMenu: true
property bool isArtworkRemote : false
property bool showIndicator : false
property alias headerMenu: headerMenu
property alias contextMenu : contextMenu
......@@ -94,7 +95,9 @@ BabeList
delegate: TableDelegate
{
id: delegate
width: list.width
number : trackNumberVisible ? true : false
quickPlay: quickPlayVisible
coverArt : coverArtVisible
......@@ -104,6 +107,8 @@ BabeList
color: babeTableRoot.labelColor
bgColor: headerBarColor
remoteArtwork: isArtworkRemote
playingIndicator: showIndicator
Connections
{
target: delegate
......
import QtQuick 2.9
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.2
import "../../view_models"
import QtGraphicalEffects 1.0
import "../../utils/Help.js" as H
import org.kde.kirigami 2.2 as Kirigami
import "../../view_models"
import "../../utils/Help.js" as H
ItemDelegate
{
id: delegateRoot
readonly property int altHeight : rowHeight * 1.2
width: parent.width
height: sameAlbum ? rowHeight : altHeight
clip: true
autoExclusive: true
readonly property int altHeight : rowHeight * 1.2
signal play()
signal rightClicked()
signal leftClicked()
......@@ -46,7 +48,7 @@ ItemDelegate
property bool menuItem : false
property bool trackDurationVisible : false
property bool trackRatingVisible: false
// property bool playingIndicator: false
property bool playingIndicator: false
property string trackMood : art
property alias trackRating : trackRating
......@@ -131,6 +133,28 @@ ItemDelegate
onClicked: artworkCoverClicked()
onPressAndHold: if(isMobile) artworkCoverDoubleClicked()
}
Rectangle
{
visible : playingIndicator && (currentTrackIndex === index)
height: parent.height * 0.4
width: height
anchors.bottom: parent.bottom
anchors.bottomMargin: space.big
anchors.horizontalCenter:parent.horizontalCenter
radius: Math.min(width, height)
color: "white"
AnimatedImage
{
source: "qrc:/assets/heart_indicator.gif"
anchors.centerIn: parent
height: parent.height * 0.6
width: parent.width * 0.6
playing: parent.visible
}
}
}
Item
......@@ -158,7 +182,7 @@ ItemDelegate
Layout.fillWidth: true
Layout.alignment: Qt.AlignLeft
Layout.margins: space.tiny
Layout.leftMargin: space.small
Layout.leftMargin: space.small * (quickPlay ? 1 : 2)
anchors.verticalCenter: parent.verticalCenter
GridLayout
......
......@@ -9,7 +9,6 @@ ListView
id: albumsRollRoot
orientation: ListView.Horizontal
clip: true
spacing: space.huge
focus: true
interactive: true
currentIndex: currentTrackIndex
......@@ -22,12 +21,13 @@ ListView
delegate: BabeAlbum
{
id: delegate
height: coverSize
width: coverSize
itemHeight: coverSize
itemWidth: coverSize + space.huge
albumSize : coverSize
albumRadius : 0
showLabels: false
showIndicator: true
hideRepeated: true
anchors.verticalCenter: parent.verticalCenter
Connections
......
......@@ -311,7 +311,8 @@ Item
quickPlayVisible: false
coverArtVisible: true
trackRating: true
headerBarColor : darkButtonBackgroundColor
showIndicator : true
holder.message : "<h2>Meh!</h2><p>Start putting together your playlist!</p>"
holder.emoji: "qrc:/assets/face-sleeping.png"
......
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