Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit deed22cd authored by Camilo Higuita's avatar Camilo Higuita

tighing up things for the best ebta release of the best music player. meh

parent 4f004aa6
......@@ -95,13 +95,14 @@ Kirigami.ApplicationWindow
/*READONLY PROPS*/
readonly property var iconSizes : ({ "small" : 16, "medium" : isMobile ? 24 : 22, "big" : 32, "large" : 48 })
readonly property var fontSizes : ({"tiny": isMobile ? 6.5 : 7, "small" : isMobile ? 8.5 : 8, "medium" : isMobile ? 9 : 9.5, "big" : isMobile ? 10 : 10.5, "large" : isMobile ? 11 : 11.5})
readonly property real opacityLevel : 0.8
readonly property bool isMobile: bae.isMobile()
readonly property int wideSize : bae.screenGeometry("width")*0.5
readonly property int rowHeight: isMobile ? 64 : 52
readonly property int rowHeightAlt: isMobile ? 48 : 32
readonly property int headerHeight: rowHeight
readonly property int contentMargins : 15
readonly property int contentMargins : 12
readonly property var viewsIndex : ({
"babeit": 0,
"tracks" : 1,
......@@ -110,6 +111,7 @@ Kirigami.ApplicationWindow
"playlists" : 4,
"search" : 5
})
readonly property bool mainlistEmpty : mainPlaylist.table.count > 0
/*PROPS*/
property int toolBarIconSize: bae.loadSetting("ICON_SIZE", "BABE", iconSizes.medium)
......@@ -123,7 +125,7 @@ Kirigami.ApplicationWindow
property string syncPlaylist : ""
property bool sync : false
property string infoMsg : ""
property bool timeLabels : false
property bool infoLabels : true
/*SIGNALS*/
signal missingAlert(var track)
......@@ -211,9 +213,10 @@ Kirigami.ApplicationWindow
target: bae
onRefreshTables:
{
console.log("Clearing tables")
tracksView.list.clearTable()
albumsView.list.clearGrid()
artistsView.list.clearGrid()
albumsView.clearGrid()
artistsView.clearGrid()
tracksView.populate()
albumsView.populate()
......@@ -381,20 +384,6 @@ Kirigami.ApplicationWindow
color: babeColor
}
Label
{
id: progressTime
anchors.top: parent.top
anchors.right: parent.right
visible: timeLabels
horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter
text: progressTimeLabel +" / "+durationTimeLabel
color: foregroundColor
font.pointSize: 6.5
padding: 0
elide: Text.ElideRight
}
}
RowLayout
......@@ -407,13 +396,15 @@ Kirigami.ApplicationWindow
{
Layout.fillHeight: true
Layout.alignment: Qt.AlignLeft
Layout.fillWidth: true
height: headerHeight
width: headerHeight
width: miniArtwork.visible ? headerHeight : 0
Image
{
visible: (!pageStack.wideMode && pageStack.currentIndex !== 0) || !mainPlaylist.cover.visible
id: miniArtwork
visible: ((!pageStack.wideMode && pageStack.currentIndex !== 0) || !mainPlaylist.cover.visible) && mainlistEmpty
height: headerHeight
width: headerHeight
......@@ -442,44 +433,56 @@ Kirigami.ApplicationWindow
}
}
Item { Layout.fillWidth: true }
GridLayout
{
Layout.fillHeight: true
Layout.alignment: Qt.AlignCenter
Layout.fillWidth: true
// rowSpacing: 0
// columnSpacing: 0
anchors.horizontalCenter: parent.horizontalCenter
rows: 2
columns: 5
columns: 7
Label
{
id: playbackInfo
visible: mainlistEmpty && infoLabels
anchors.top: playIcon.bottom
anchors.horizontalCenter: playIcon.horizontalCenter
Layout.alignment: Qt.AlignCenter
Layout.fillWidth: true
Layout.row: 2
Layout.column: 1
Layout.columnSpan: 5
Layout.columnSpan: 7
Layout.maximumWidth: root.width * 0.5
horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter
text: currentTrack ? (currentTrack.title ? currentTrack.title + " - " + currentTrack.artist : "--- - "+currentTrack.artist) : ""
text: progressTimeLabel + " / " + (currentTrack ? (currentTrack.title ? currentTrack.title + " - " + currentTrack.artist : "--- - "+currentTrack.artist) : "") + " / " + durationTimeLabel
color: foregroundColor
font.pointSize: 6
font.pointSize: fontSizes.small
elide: Text.ElideRight
}
Item
{
Layout.fillWidth: true
Layout.row: 1
Layout.column: 1
Rectangle
{
anchors.fill: parent
color: "blue"
z: -999
}
}
BabeButton
{
id: babeBtnIcon
Layout.row: 1
Layout.column: 1
Layout.column: 2
iconName: "love"
iconColor: currentBabe ? babeColor : defaultColor
......@@ -495,7 +498,7 @@ Kirigami.ApplicationWindow
{
id: previousBtn
Layout.row: 1
Layout.column: 2
Layout.column: 3
iconName: "media-skip-backward"
onClicked: Player.previousTrack()
......@@ -506,7 +509,7 @@ Kirigami.ApplicationWindow
{
id: playIcon
Layout.row: 1
Layout.column: 3
Layout.column: 4
iconName: "media-playback-start"
onClicked:
......@@ -520,7 +523,7 @@ Kirigami.ApplicationWindow
{
id: nextBtn
Layout.row: 1
Layout.column: 4
Layout.column: 5
iconName: "media-skip-forward"
onClicked: Player.nextTrack()
......@@ -531,26 +534,35 @@ Kirigami.ApplicationWindow
{
id: shuffleBtn
Layout.row: 1
Layout.column: 5
Layout.column: 6
iconName: shuffle ? "media-playlist-shuffle" : "media-playlist-repeat"
onClicked: shuffle = !shuffle
}
Item
{
Layout.fillWidth: true
Layout.row: 1
Layout.column: 7
Rectangle
{
anchors.fill: parent
color: "blue"
z: -999
}
}
}
Item { Layout.fillWidth: true }
Item
{
Layout.fillHeight: true
Layout.fillWidth: true
Layout.alignment: Qt.AlignRight
height: headerHeight
width: headerHeight
width: miniArtwork.visible ? headerHeight : 0
}
}
......@@ -618,7 +630,7 @@ Kirigami.ApplicationWindow
anchors.fill: parent
height: parent.height
width: parent.width
font.pointSize: 9
font.pointSize: fontSizes.medium
text: infoMsg
horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter
......
......@@ -16,7 +16,7 @@ ColumnLayout
property bool albumCard : true
property string fillColor: midLightColor
property string textColor: foregroundColor
property int fontSize : root.isMobile? 12 : 10
property int fontSize : fontSizes.big
property bool hide : false
// height: typeof album === 'undefined' ? parseInt(albumSize+(albumSize*0.3)) : parseInt(albumSize+(albumSize*0.4))
......@@ -105,7 +105,7 @@ ColumnLayout
visible: true
horizontalAlignment: Qt.AlignHCenter
elide: Text.ElideRight
font.pointSize: fontSize
font.pointSize: fontSizes.medium
font.bold: true
color: textColor
}
......@@ -117,7 +117,7 @@ ColumnLayout
visible: typeof album === 'undefined'? false : true
horizontalAlignment: Qt.AlignHCenter
elide: Text.ElideRight
font.pointSize: fontSize-1
font.pointSize: fontSizes.small
color: textColor
}
......
......@@ -49,7 +49,7 @@ Popup
height: parent.height
width: parent.width
text: message
font.pointSize: 9
font.pointSize: fontSizes.medium
horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter
color: foregroundColor
......
This diff is collapsed.
......@@ -5,6 +5,7 @@ import QtQuick.Controls 2.2
Item
{
property int recSize : 16
readonly property int recRadius : 4
signal colorClicked(string color)
RowLayout
......@@ -24,7 +25,7 @@ Item
width: recSize
height: recSize
color: bae.moodColor(0)
radius: 2
radius: recRadius
border.color: altColor
border.width: 1
}
......@@ -43,7 +44,7 @@ Item
width: recSize
height: recSize
color: bae.moodColor(1)
radius: 2
radius: recRadius
border.color: altColor
border.width: 1
}
......@@ -62,7 +63,7 @@ Item
width: recSize
height: recSize
color: bae.moodColor(2)
radius: 2
radius: recRadius
border.color: altColor
border.width: 1
}
......@@ -81,7 +82,7 @@ Item
width: recSize
height: recSize
color: bae.moodColor(3)
radius: 2
radius: recRadius
border.color: altColor
border.width: 1
}
......@@ -101,7 +102,7 @@ Item
width: recSize
height: recSize
color: bae.moodColor(4)
radius: 2
radius: recRadius
border.color: altColor
border.width: 1
}
......
......@@ -37,7 +37,7 @@ BabePopup
headerBarExit: true
headerBarVisible: true
headerBarTitle: "Select"
headerBarTitle: "Select8"
headerBarLeft: [
......
......@@ -14,6 +14,7 @@ BabeGrid
visible: true
property alias list : drawerList.list
property alias table : drawerList
signal rowClicked(var track)
signal playAlbum(var tracks)
......
......@@ -15,6 +15,7 @@ BabeGrid
// albumCardVisible: false
// albumCoverRadius: Math.min(albumCoverSize, albumCoverSize)
property alias list : drawerList.list
property alias table : drawerList
signal rowClicked(var track)
signal playAlbum(var tracks)
......
......@@ -59,7 +59,7 @@ Page
padding: 20
text: lyrics
color: foregroundColor
font.pointSize: 12
font.pointSize: fontSizes.big
horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter
textFormat: Text.RichText
......@@ -144,7 +144,7 @@ Page
text: wikiAlbum
visible: wikiAlbum === "NONE" || wikiAlbum.length===0 ? false : true
color: foregroundColor
font.pointSize: 12
font.pointSize: fontSizes.big
horizontalAlignment: Qt.AlignHCenter
textFormat: Text.RichText
wrapMode: Text.Wrap
......@@ -171,7 +171,7 @@ Page
visible: wikiArtist === "NONE" || wikiArtist.length===0 ? false : true
color: foregroundColor
font.pointSize: 12
font.pointSize: fontSizes.big
horizontalAlignment: Qt.AlignHCenter
textFormat: Text.StyledText
wrapMode: Text.Wrap
......
......@@ -20,7 +20,7 @@ Item
{
text: lyrics || "Nothing here"
color: foregroundColor
font.pointSize: 14
font.pointSize: fontSizes.big
horizontalAlignment: Qt.AlignHCenter
textFormat: Text.StyledText
}
......
......@@ -63,7 +63,7 @@ Item
Layout.fillWidth: true
Layout.preferredHeight: visible ? coverSize : 0
Layout.maximumHeight: 300
visible: list.count > 0
visible: mainlistEmpty
Rectangle
{
......@@ -120,7 +120,7 @@ Item
Layout.fillWidth: true
Layout.preferredHeight: visible ? toolBarHeight : 0
// anchors.top: cover.bottom
visible: list.count > 0
visible: mainlistEmpty
Rectangle
{
......@@ -196,8 +196,6 @@ Item
}
}
Item
{
Layout.fillWidth: true
......
......@@ -68,10 +68,9 @@ ItemDelegate
font.bold: false
elide: Text.ElideRight
font.pointSize: 10
font.pointSize: fontSizes.medium
color: textColor
}
}
// Item
......
......@@ -136,7 +136,7 @@ Kirigami.GlobalDrawer
Kirigami.Action
{
text: "Time labels"
text: "Info label"
Kirigami.Action
{
......@@ -146,7 +146,7 @@ Kirigami.GlobalDrawer
onToggled:
{
// bae.saveSetting("BRAINZ", checked === true ? true : false, "BABE")
timeLabels = checked
infoLabels = checked
}
}
}
......
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