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 5dcdb124 authored by camilo higuita's avatar camilo higuita

all the fixes needed to run with latest mauikit

parent 1df13d18
......@@ -157,7 +157,7 @@ Maui.ApplicationWindow
// headBarBGColor: "#212121"
// altColorText: darkTextColor
// headBar.spacing: space.big
// headBar.spacing: Maui.Style.space.big
headBar.middleContent : Kirigami.ActionToolBar
{
display: isWide ? ToolButton.TextBesideIcon : ToolButton.IconOnly
......@@ -254,7 +254,7 @@ Maui.ApplicationWindow
Slider
{
id: progressBar
Layout.preferredHeight: unit * (isMobile ? 6 : 8)
Layout.preferredHeight: Maui.Style.unit * (isMobile ? 6 : 8)
Layout.fillWidth: true
padding: 0
......@@ -289,9 +289,9 @@ Maui.ApplicationWindow
x: progressBar.leftPadding + progressBar.visualPosition
* (progressBar.availableWidth - width)
y: -(progressBar.height * 0.8)
implicitWidth: progressBar.pressed ? iconSizes.medium : 0
implicitHeight: progressBar.pressed ? iconSizes.medium : 0
radius: progressBar.pressed ? iconSizes.medium : 0
implicitWidth: progressBar.pressed ? Maui.Style.iconSizes.medium : 0
implicitHeight: progressBar.pressed ? Maui.Style.iconSizes.medium : 0
radius: progressBar.pressed ? Maui.Style.iconSizes.medium : 0
color: babeColor
}
}
......@@ -313,7 +313,12 @@ Maui.ApplicationWindow
icon.name: "headphones"
checked: _drawer.visible
icon.color: _drawer.visible ? babeColor : Kirigami.Theme.textColor
onClicked: _drawer.visible = !_drawer.visible
onClicked:
{
console.log("SHOW DRAWER?", _drawer.visible)
_drawer.visible = !_drawer.visible
}
Kirigami.Theme.highlightColor: babeColor
// text: qsTr("Now")
}
......@@ -601,7 +606,7 @@ Maui.ApplicationWindow
anchors.fill: parent
height: parent.height
width: parent.width
font.pointSize: fontSizes.medium
font.pointSize: Maui.Style.fontSizes.medium
text: infoMsg
horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter
......@@ -636,23 +641,17 @@ Maui.ApplicationWindow
id: playlistDialog
}
globalDrawer: Maui.GlobalDrawer
sideBar: Maui.AbstractSideBar
{
id: _drawer
width: Math.min(Kirigami.Units.gridUnit * 18, root.width)
height: root.height - root.headBar.implicitHeight - root.footBar.implicitHeight
width: visible ? Math.min(Kirigami.Units.gridUnit * 18, root.width) : 0
modal: !isWide
handleVisible: false
closePolicy: Popup.NoAutoClose
handleClosedIcon.source: "headphones"
handleOpenIcon.source: "headphones"
handleOpenIcon.color: babeColor
handleClosedIcon.color: babeColor
contentItem: MainPlaylist
MainPlaylist
{
id: mainPlaylist
anchors.fill: parent
Connections
{
target: mainPlaylist
......@@ -718,7 +717,7 @@ Maui.ApplicationWindow
holder.isMask: false
holder.title : "No Albums!"
holder.body: "Add new music sources"
holder.emojiSize: iconSizes.huge
holder.emojiSize: Maui.Style.iconSizes.huge
title: count + qsTr(" albums")
list.query: Albums.ALBUMS
list.sortBy: Albums.ALBUM
......@@ -772,7 +771,7 @@ Maui.ApplicationWindow
holder.isMask: false
holder.title : qsTr("No Artists!")
holder.body: qsTr("Add new music sources")
holder.emojiSize: iconSizes.huge
holder.emojiSize: Maui.Style.iconSizes.huge
title: count + qsTr(" artists")
list.query: Albums.ARTISTS
list.sortBy: Albums.ARTIST
......@@ -953,9 +952,9 @@ Maui.ApplicationWindow
id: _selectionBar
property alias listView: _selectionBar.selectionList
Layout.fillWidth: true
Layout.margins: space.big
Layout.topMargin: space.small
Layout.bottomMargin: space.big
Layout.margins: Maui.Style.space.big
Layout.topMargin: Maui.Style.space.small
Layout.bottomMargin: Maui.Style.space.big
onIconClicked: _contextMenu.popup()
onExitClicked: clear()
// Kirigami.Theme.backgroundColor: "#212121"
......
......@@ -8,7 +8,7 @@ Maui.Dialog
{
id: linkingDialogRoot
maxHeight: unit *400
maxHeight: Maui.Style.unit *400
onAccepted:
{
......@@ -40,7 +40,7 @@ Maui.Dialog
text:qsTr("Linking allows to connect two devices on the same network. Just provide the device IP address to which you want to connect")
verticalAlignment: Qt.AlignVCenter
elide: Text.ElideRight
font.pointSize: fontSizes.default
font.pointSize: Maui.Style.fontSizes.default
wrapMode: Text.Wrap
Layout.fillWidth: true
}
......@@ -50,7 +50,7 @@ Maui.Dialog
text: qsTr("IP Address")
verticalAlignment: Qt.AlignVCenter
elide: Text.ElideRight
font.pointSize: fontSizes.default
font.pointSize: Maui.Style.fontSizes.default
Layout.fillWidth: true
}
......@@ -96,7 +96,7 @@ Maui.Dialog
text:qsTr("This Device IP address: \n") +link.deviceIp()
verticalAlignment: Qt.AlignVCenter
elide: Text.ElideRight
font.pointSize: fontSizes.small
font.pointSize: Maui.Style.fontSizes.small
Layout.fillWidth: true
}
......
......@@ -109,7 +109,7 @@ ColumnLayout
holder.title : link.getDeviceName() ? link.getDeviceName() :
"Disconnected!"
holder.body: "Your linked playlist is empty"
holder.emojiSize: iconSizes.huge
holder.emojiSize: Maui.Style.iconSizes.huge
appendBtn.visible: false
playAllBtn.visible: false
......@@ -158,7 +158,7 @@ ColumnLayout
id: searchBox
Layout.fillWidth: true
// width: parent.width
// height: toolBarHeight
// height: Maui.Style.toolBarHeight
position: ToolBar.Footer
Rectangle
......
......@@ -73,7 +73,7 @@ heightHint: 0.9
text: qsTr("Custom API Key")
verticalAlignment: Qt.AlignVCenter
elide: Text.ElideRight
font.pointSize: fontSizes.default
font.pointSize: Maui.Style.fontSizes.default
Layout.column: 1
Layout.row: 2
Layout.fillWidth: true
......@@ -92,7 +92,7 @@ heightHint: 0.9
text: qsTr("Search results")
verticalAlignment: Qt.AlignVCenter
elide: Text.ElideRight
font.pointSize: fontSizes.default
font.pointSize: Maui.Style.fontSizes.default
Layout.column: 1
Layout.row: 4
Layout.fillWidth: true
......@@ -185,7 +185,7 @@ heightHint: 0.9
holder.isMask: false
holder.title : "No Results!"
holder.body: "Try with another query"
holder.emojiSize: iconSizes.huge
holder.emojiSize: Maui.Style.iconSizes.huge
coverArtVisible: true
trackDuration: true
trackRating: true
......
......@@ -2,12 +2,13 @@ import QtQuick 2.9
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.1
import org.kde.mauikit 1.0 as Maui
Popup
{
property string message : ""
id: notify
width: columnWidth
width: cMaui.Style.rowHeighth
height: rowHeight
padding: 0
......@@ -49,7 +50,7 @@ Popup
height: parent.height
width: parent.width
text: message
font.pointSize: fontSizes.medium
font.pointSize: Maui.Style.fontSizes.medium
horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter
color: textColor
......
......@@ -13,7 +13,7 @@ SwipeDelegate
{
id: delegateRoot
readonly property int altHeight : rowHeight * 1.4
readonly property int altHeight : Maui.Style.rowHeight * 1.4
readonly property bool sameAlbum :
{
if(coverArt)
......@@ -41,7 +41,7 @@ SwipeDelegate
property bool remoteArtwork: false
width: parent.width
height: sameAlbum ? rowHeight : altHeight
height: sameAlbum ? Maui.Style.rowHeight : altHeight
padding: 0
swipe.enabled: false
hoverEnabled: !isMobile
......@@ -79,7 +79,7 @@ SwipeDelegate
Item
{
anchors.fill: parent
anchors.margins: space.small
anchors.margins: Maui.Style.space.small
MouseArea
{
......@@ -173,9 +173,9 @@ SwipeDelegate
{
visible: quickPlay
Layout.fillHeight: true
width: iconSize * 1.5
width: Maui.Style.iconSizes.medium * 1.5
height: parent.height
Layout.leftMargin: space.small
Layout.leftMargin: Maui.Style.space.small
ToolButton
{
......@@ -183,7 +183,7 @@ SwipeDelegate
anchors.centerIn: parent
icon.name: "media-playback-start"
icon.color: labelColor
icon.width: iconSizes.medium
icon.width: Maui.Style.iconSizes.medium
onClicked: play()
}
}
......@@ -193,9 +193,9 @@ SwipeDelegate
Layout.fillHeight: true
Layout.fillWidth: true
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
Layout.margins: space.tiny
Layout.leftMargin: space.small * (quickPlay ? 1 : 2)
Layout.rightMargin: space.big
Layout.margins: Maui.Style.space.tiny
Layout.leftMargin: Maui.Style.space.small * (quickPlay ? 1 : 2)
Layout.rightMargin: Maui.Style.space.big
GridLayout
{
......@@ -203,7 +203,7 @@ SwipeDelegate
width: parent.width
rows: 2
columns: 4
rowSpacing: space.tiny
rowSpacing: Maui.Style.space.tiny
Label
{
......@@ -221,7 +221,7 @@ SwipeDelegate
font.bold: true
elide: Text.ElideRight
font.pointSize: fontSizes.default
font.pointSize: Maui.Style.fontSizes.default
color: labelColor
}
......@@ -239,7 +239,7 @@ SwipeDelegate
// font.bold: !sameAlbum
font.weight: Font.Regular
elide: Text.ElideRight
font.pointSize: fontSizes.default
font.pointSize: Maui.Style.fontSizes.default
color: labelColor
}
......@@ -257,7 +257,7 @@ SwipeDelegate
text: model.artist + " | " + model.album
font.bold: false
elide: Text.ElideRight
font.pointSize: fontSizes.medium
font.pointSize: Maui.Style.fontSizes.medium
color: labelColor
opacity: isCurrentListItem || hovered ? 0.8 : 0.6
......@@ -281,7 +281,7 @@ SwipeDelegate
text: model.fav ? (model.fav == "1" ? "\uf2D1" : "") : ""
font.bold: false
elide: Text.ElideRight
font.pointSize: fontSizes.small
font.pointSize: Maui.Style.fontSizes.small
color: labelColor
}
......@@ -303,7 +303,7 @@ SwipeDelegate
text: model.rate ? H.setStars(model.rate) : ""
font.bold: false
elide: Text.ElideRight
font.pointSize: fontSizes.small
font.pointSize: Maui.Style.fontSizes.small
color: labelColor
}
}
......@@ -314,7 +314,7 @@ SwipeDelegate
visible: menuItem
Layout.fillHeight: true
// Layout.fillWidth: true
width: space.enormous
width: Maui.Style.space.enormous
MouseArea
{
......@@ -354,10 +354,10 @@ SwipeDelegate
swipe.right: Row
{
padding: space.medium
padding: Maui.Style.space.medium
height: delegateRoot.height
anchors.right: parent.right
spacing: space.medium
spacing: Maui.Style.space.medium
ToolButton
{
......
......@@ -12,7 +12,7 @@ import org.kde.kirigami 2.6 as Kirigami
Menu
{
id: control
width: unit * 200
width: Maui.Style.unit * 200
property int rate : 0
property bool fav : false
......@@ -154,7 +154,7 @@ Menu
{
id: starsRow
width: parent.width
height: iconSizes.medium + space.small
height: Maui.Style.iconSizes.medium + Maui.Style.space.small
RowLayout
{
......@@ -165,7 +165,7 @@ Menu
Layout.fillWidth: true
Layout.fillHeight: true
icon.name: starIcon
icon.width: iconSizes.medium
icon.width: Maui.Style.iconSizes.medium
icon.color: rate >= 1 ? starColor :starReg
onClicked:
{
......@@ -179,7 +179,7 @@ Menu
{
Layout.fillWidth: true
Layout.fillHeight: true
icon.width: iconSizes.medium
icon.width: Maui.Style.iconSizes.medium
icon.name: starIcon
icon.color: rate >= 2 ? starColor :starReg
onClicked:
......@@ -194,7 +194,7 @@ Menu
{
Layout.fillWidth: true
Layout.fillHeight: true
icon.width: iconSizes.medium
icon.width: Maui.Style.iconSizes.medium
icon.name: starIcon
icon.color: rate >= 3 ? starColor :starReg
onClicked:
......@@ -209,7 +209,7 @@ Menu
{
Layout.fillWidth: true
Layout.fillHeight: true
icon.width: iconSizes.medium
icon.width: Maui.Style.iconSizes.medium
icon.name: starIcon
icon.color: rate >= 4 ? starColor :starReg
onClicked:
......@@ -224,7 +224,7 @@ Menu
{
Layout.fillWidth: true
Layout.fillHeight: true
icon.width: iconSizes.medium
icon.width: Maui.Style.iconSizes.medium
icon.name: starIcon
icon.color: rate >= 5 ? starColor :starReg
onClicked:
......@@ -242,7 +242,7 @@ Menu
{
id: colorsRow
width: parent.width
height: iconSizes.medium + space.small
height: Maui.Style.iconSizes.medium + Maui.Style.space.small
ColorTagsBar
{
......
import QtQuick 2.9
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.2
import org.kde.mauikit 1.0 as Maui
Item
{
property int recSize : iconSizes.small
property int recSize: Maui.Style.iconSizes.small
readonly property int recRadius : recSize*0.05
signal colorClicked(string color)
......
......@@ -34,7 +34,7 @@ BabeGrid
signal albumCoverPressedAndHold(string album, string artist)
visible: true
// topPadding: space.large
// topPadding: Maui.Style.space.large
onAlbumCoverPressed: albumCoverPressedAndHold(album, artist)
headBar.visible: false
// headBar.rightContent: Kirigami.ActionToolBar
......@@ -100,7 +100,7 @@ BabeGrid
id: albumDialog
parent: parent
maxHeight: maxWidth
maxWidth: unit * 600
maxWidth: Maui.Style.unit * 600
widthHint: 1
heightHint: 1
defaultButtons: false
......@@ -131,7 +131,7 @@ BabeGrid
holder.isMask: false
holder.title : "Oops!"
holder.body: "This list is empty"
holder.emojiSize: iconSizes.huge
holder.emojiSize: Maui.Style.iconSizes.huge
onRowClicked:
{
......
......@@ -37,7 +37,7 @@ Item
isMask: false
title : "No Folders!"
body: "Add new music to your sources to browse by folders"
emojiSize: iconSizes.huge
emojiSize: Maui.Style.iconSizes.huge
}
Maui.Dialog
......
......@@ -59,7 +59,7 @@ Maui.Dialog
readOnly: true
padding: 20
color: "white"
font.pointSize: fontSizes.big
font.pointSize: Maui.Style.fontSizes.big
horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter
textFormat: Text.RichText
......@@ -148,7 +148,7 @@ Maui.Dialog
text: wikiAlbum
visible: wikiAlbum === "NONE" || wikiAlbum.length===0 ? false : true
color: darkTextColor
font.pointSize: fontSizes.big
font.pointSize: Maui.Style.fontSizes.big
horizontalAlignment: Qt.AlignHCenter
textFormat: Text.RichText
wrapMode: Text.Wrap
......@@ -176,7 +176,7 @@ Maui.Dialog
visible: wikiArtist === "NONE" || wikiArtist.length===0 ? false : true
color: darkTextColor
font.pointSize: fontSizes.big
font.pointSize: Maui.Style.fontSizes.big
horizontalAlignment: Qt.AlignHCenter
textFormat: Text.StyledText
wrapMode: Text.Wrap
......
import QtQuick 2.9
import QtQuick.Controls 2.2
import org.kde.mauikit 1.0 as Maui
Item
{
......@@ -19,8 +20,7 @@ Item
Text
{
text: lyrics || "Nothing here"
color: foregroundColor
font.pointSize: fontSizes.big
color: foregrou Maui.Style.fontSizes. font.pointSize: fontSizes.big
horizontalAlignment: Qt.AlignHCenter
textFormat: Text.StyledText
}
......
......@@ -41,11 +41,11 @@ Maui.Page
}
footBar.visible: !mainlistEmpty
footBar.implicitHeight: toolBarHeight * 1.3
footBar.implicitHeight: Maui.Style.toolBarHeight * 1.3
footBar.width: parent.width
footBar.middleContent: AlbumsRoll
{
// height: toolBarHeight * 1.3
// height: Maui.Style.toolBarHeight * 1.3
Layout.fillWidth: true
Layout.fillHeight: true
// width: footBar.width
......@@ -124,7 +124,7 @@ Maui.Page
holder.isMask: false
holder.title : "Meh!"
holder.body: "Start putting together your playlist!"
holder.emojiSize: iconSizes.huge
holder.emojiSize: Maui.Style.iconSizes.huge
onRowClicked: play(index)
onArtworkDoubleClicked: contextMenu.babeIt(index)
......
......@@ -78,7 +78,7 @@ ColumnLayout
id: _filterDialog
parent: parent
maxHeight: maxWidth
maxWidth: unit * 600
maxWidth: Maui.Style.unit * 600
defaultButtons: false
page.padding: 0
......@@ -97,7 +97,7 @@ ColumnLayout
holder.isMask: false
holder.title : playlistViewModel.model.get(playlistViewModel.currentIndex).playlist
holder.body: "Your playlist is empty,<br>start adding new music to it"
holder.emojiSize: iconSizes.huge
holder.emojiSize: Maui.Style.iconSizes.huge
contextMenuItems:
MenuItem
......
......@@ -9,7 +9,7 @@ Maui.Popup
{
id: searchSuggestionsRoot
property alias model : suggestionsList.model
maxHeight: unit * 700
maxHeight: Maui.Style.unit * 700
heightHint: 0.5
verticalAlignment: Qt.AlignBottom
......
......@@ -26,7 +26,7 @@ BabeTable
holder.isMask: false
holder.title : "No search results!"
holder.body: "Try with another query"
holder.emojiSize: iconSizes.huge
holder.emojiSize: Maui.Style.iconSizes.huge
coverArtVisible: true
trackDuration: true
trackRating: true
......
......@@ -14,7 +14,7 @@ import org.kde.mauikit 1.0 as Maui
Menu
{
id: control
width: unit * 200
width: Maui.Style.unit * 200
property int rate : 0
property string starColor : "#FFC107"
......@@ -112,7 +112,7 @@ Menu
// {
// id: starsRow
// width: parent.width
// height: iconSizes.medium + space.small
// height: Maui.Style.iconSizes.medium + Maui.Style.space.small
// RowLayout
// {
......@@ -123,7 +123,7 @@ Menu
// Layout.fillWidth: true
// Layout.fillHeight: true
// icon.name: starIcon
// icon.width: iconSizes.medium
// icon.width: Maui.Style.iconSizes.medium
// icon.color: rate >= 1 ? starColor :starReg
// onClicked:
// {
......@@ -135,7 +135,7 @@ Menu
// {
// Layout.fillWidth: true
// Layout.fillHeight: true
// icon.width: iconSizes.medium
// icon.width: Maui.Style.iconSizes.medium
// icon.name: starIcon
// icon.color: rate >= 2 ? starColor :starReg
// onClicked:
......@@ -148,7 +148,7 @@ Menu
// {
// Layout.fillWidth: true
// Layout.fillHeight: true
// icon.width: iconSizes.medium
// icon.width: Maui.Style.iconSizes.medium
// icon.name: starIcon
// icon.color: rate >= 3 ? starColor :starReg
// onClicked:
......@@ -161,7 +161,7 @@ Menu
// {
// Layout.fillWidth: true
// Layout.fillHeight: true
// icon.width: iconSizes.medium
// icon.width: Maui.Style.iconSizes.medium
// icon.name: starIcon
// icon.color: rate >= 4 ? starColor :starReg
// onClicked:
......@@ -174,7 +174,7 @@ Menu
// {
// Layout.fillWidth: true
// Layout.fillHeight: true
// icon.width: iconSizes.medium
// icon.width: Maui.Style.iconSizes.medium
// icon.name: starIcon
// icon.color: rate >= 5 ? starColor :starReg
// onClicked:
......@@ -198,7 +198,7 @@ Menu
// {
// id: colorsRow
// width: parent.width
// height: iconSizes.medium + space.small
// height: Maui.Style.iconSizes.medium + Maui.Style.space.small
// ColorTagsBar
// {
......
......@@ -61,7 +61,7 @@ Maui.Popup
Layout.fillHeight: true
Layout.fillWidth: true
readOnly: true
font.pointSize: fontSizes.small
font.pointSize: Maui.Style.fontSizes.small
wrapMode: TextEdit.WordWrap
background: Rectangle
{
......
......@@ -9,8 +9,8 @@ Maui.Dialog
{
property string pathToRemove : ""
maxWidth: unit * 600
maxHeight: unit * 500
maxWidth: Maui.Style.unit * 600
maxHeight: Maui.Style.unit * 500
defaultButtons: true
acceptButton.text: qsTr("Add")
rejectButton.text: qsTr("Remove")
......
......@@ -17,7 +17,7 @@ BabeTable
holder.isMask: false
holder.title : "No Tracks!"
holder.body: "Add new music sources"
holder.emojiSize: iconSizes.huge
holder.emojiSize: Maui.Style.iconSizes.huge
list.query: Q.GET.allTracks
}
......
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