Commit a7f4a953 authored by Camilo Higuita's avatar Camilo Higuita

add placeholder illustrations and quick fixes

parent abf953c3
breeze-icons @ a54611fa
Subproject commit dc7909ded2d29e27956f6df0a61fc10d890ba2c6
Subproject commit a54611fafe2c47d2f2ff2bbe21dbcf234a855ec2
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg width="22" version="1.1" xmlns="http://www.w3.org/2000/svg" height="22" viewBox="0 0 5.8208332 5.8208335" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape">
<defs id="defs4"/>
<metadata id="metadata7"/>
<g inkscape:label="Capa 1" inkscape:groupmode="layer" id="layer1" transform="matrix(1 0 0 1 0 -291.17916)">
<rect width="5.291667" x="0.264583" y="291.70834" rx="2.116651" height="4.762512" style="fill:#fdd583" id="rect4152"/>
<path inkscape:connector-curvature="0" style="fill:#87b6f1" id="path4167" d="m 4.4979163,295.5448 c -2.8e-6,0.21919 -0.1776889,0.39687 -0.396875,0.39687 -0.2191861,0 -0.3968722,-0.17768 -0.396875,-0.39687 -2.8e-6,-0.21919 0.396875,-0.92606 0.396875,-0.92606 0,0 0.3968778,0.70687 0.396875,0.92606 z"/>
<path inkscape:connector-curvature="0" style="fill:#8f5315" id="rect4160" d="m 3.8271565,293.7573 c -0.06822,0 -0.095332,0.0687 -0.1100791,0.1018 -0.00838,0.0321 -0.012721,0.065 -0.012911,0.0982 0,0.21918 0.1776871,0.39687 0.396875,0.39687 0.1706962,-1.2e-4 0.3221951,-0.10937 0.3762045,-0.2713 l 0.00723,-0.0233 c 0.018968,-0.0708 -0.022741,-0.14277 -0.093534,-0.16174 l -0.5110789,-0.13695 c -0.017698,-0.005 -0.035684,-0.006 -0.05271,-0.004 z"/>
<path inkscape:connector-curvature="0" style="fill:#8f5315" id="path4174" d="m 1.9459467,293.7573 c 0.06822,0 0.095332,0.0687 0.1100791,0.1018 0.00838,0.0321 0.012721,0.065 0.012911,0.0982 0,0.21918 -0.1776871,0.39687 -0.3968751,0.39687 -0.1706962,-1.2e-4 -0.322195,-0.10937 -0.3762044,-0.2713 l -0.00723,-0.0233 c -0.018968,-0.0708 0.022741,-0.14277 0.093534,-0.16174 l 0.511079,-0.13695 c 0.017698,-0.005 0.035684,-0.006 0.05271,-0.004 z"/>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg width="22" version="1.1" xmlns="http://www.w3.org/2000/svg" height="22" viewBox="0 0 5.8208332 5.8208335" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape">
<defs id="defs4"/>
<metadata id="metadata7"/>
<g inkscape:label="Capa 1" inkscape:groupmode="layer" id="layer1" transform="matrix(1 0 0 1 0 -291.17916)">
<path inkscape:connector-curvature="0" style="fill:#8f5315" id="path4280" d="m 4.7552653,294.51437 c 0.9768806,0.8218 -0.7066855,0.98312 -0.125057,1.16272 0.6614584,0 0.9260444,-0.30999 0.9260417,-0.52918 -1.1e-6,-0.0891 -0.5291667,-0.79373 -0.8009847,-0.63354 z"/>
<rect width="5.02708" x="0.264583" y="291.70834" rx="2.116651" height="4.762512" style="fill:#fdd583" id="rect4152"/>
<path inkscape:connector-curvature="0" style="fill:#8f5315" id="path4233" d="m 2.4962816,294.08959 a 0.8383182,1.1465173 0 0 0 0.705284,0.52915 0.8383182,1.1465173 0 0 0 0.7061034,-0.52915 l -0.082281,0 a 0.83831804,1.058328 0 0 1 -0.6238266,0.35277 0.83831804,1.058328 0 0 1 -0.6234173,-0.35277 l -0.081864,0 z"/>
<path inkscape:connector-curvature="0" style="fill:#8f5315" id="path4184" d="m 1.9843746,293.03124 a 0.39687501,0.39687501 0 0 0 -0.396875,0.39688 0.39687501,0.39687501 0 0 0 0.023254,0.13229 0.39687501,0.39687501 0 0 1 0.3736206,-0.26459 0.39687501,0.39687501 0 0 1 0.3736206,0.26459 0.39687501,0.39687501 0 0 0 0.023254,-0.13229 0.39687501,0.39687501 0 0 0 -0.396875,-0.39688 z"/>
<path inkscape:connector-curvature="0" style="fill:#8f5315" id="path4231" d="m 4.3656252,293.03125 a 0.39687501,0.39687501 0 0 0 -0.3968753,0.39687 0.39687501,0.39687501 0 0 0 0.023254,0.13229 0.39687501,0.39687501 0 0 1 0.3736206,-0.26458 0.39687501,0.39687501 0 0 1 0.3736206,0.26458 0.39687501,0.39687501 0 0 0 0.023254,-0.13229 0.39687501,0.39687501 0 0 0 -0.3968747,-0.39687 z"/>
<path inkscape:connector-curvature="0" style="fill:#8f5315" id="path4249" d="m 1.5802651,294.51437 c 0.9768806,0.8218 -0.70668549,0.98312 -0.125057,1.16272 0.6614584,0 0.9260444,-0.30999 0.9260417,-0.52918 -1.1e-6,-0.0891 -0.5291666,-0.79373 -0.8009847,-0.63354 z"/>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg width="22" version="1.1" xmlns="http://www.w3.org/2000/svg" height="22" viewBox="0 0 5.8208332 5.8208335" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape">
<defs id="defs4"/>
<metadata id="metadata7"/>
<g inkscape:label="Capa 1" inkscape:groupmode="layer" id="layer1" transform="matrix(1 0 0 1 0 -291.17916)">
<rect width="5.291667" x="0.264583" y="291.70834" rx="2.116651" height="4.762512" style="fill:#fdd583" id="rect4152"/>
<path inkscape:connector-curvature="0" style="fill:#8f5315" id="path4184" d="m 1.7197914,293.03124 a 0.39687501,0.39687501 0 0 0 -0.396875,0.39688 0.39687501,0.39687501 0 0 0 0.023254,0.13229 0.39687501,0.39687501 0 0 1 0.3736206,-0.26459 0.39687501,0.39687501 0 0 1 0.3736207,0.26459 0.39687501,0.39687501 0 0 0 0.023254,-0.13229 0.39687501,0.39687501 0 0 0 -0.396875,-0.39688 z"/>
<path inkscape:connector-curvature="0" style="fill:#8f5315" id="path4231" d="m 4.1010421,293.03125 a 0.39687501,0.39687501 0 0 0 -0.3968753,0.39687 0.39687501,0.39687501 0 0 0 0.023254,0.13229 0.39687501,0.39687501 0 0 1 0.3736206,-0.26458 0.39687501,0.39687501 0 0 1 0.3736206,0.26458 0.39687501,0.39687501 0 0 0 0.023254,-0.13229 0.39687501,0.39687501 0 0 0 -0.3968747,-0.39687 z"/>
<path style="fill:#ea5756;stroke-width:3.779527" id="rect4167" d="M 6 13 C 6 15.216003 7.7839967 17 10 17 L 12 17 C 14.216003 17 16 15.216003 16 13 L 6 13 z " transform="matrix(0.26458334 0 0 0.26458334 0 291.17916)"/>
<path style="fill:#f37b7a;stroke-width:3.779527" id="path4172" d="M 11 15 A 2 1.5 0 0 0 9 16.5 A 2 1.5 0 0 0 9.0664062 16.880859 C 9.3669408 16.952515 9.6769085 17 10 17 L 12 17 C 12.322232 17 12.631835 16.954099 12.931641 16.882812 A 2 1.5 0 0 0 13 16.5 A 2 1.5 0 0 0 11 15 z " transform="matrix(0.26458334 0 0 0.26458334 0 291.17916)"/>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg width="22" version="1.1" xmlns="http://www.w3.org/2000/svg" height="22" viewBox="0 0 5.8208332 5.8208335" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape">
<defs id="defs4"/>
<metadata id="metadata7"/>
<g inkscape:label="Capa 1" inkscape:groupmode="layer" id="layer1" transform="matrix(1 0 0 1 0 -291.17916)">
<rect width="5.291667" x="0.264583" y="291.70834" rx="2.116651" height="4.762512" style="fill:#fdd583" id="rect4152"/>
<path inkscape:connector-curvature="0" style="fill:#8f5315" id="path4184" d="m 4.1010419,294.88332 a 0.39687501,0.39687501 0 0 0 0.396875,-0.39688 0.39687501,0.39687501 0 0 0 -0.023254,-0.13229 0.39687501,0.39687501 0 0 1 -0.3736205,0.26459 0.39687501,0.39687501 0 0 1 -0.3736206,-0.26459 0.39687501,0.39687501 0 0 0 -0.023254,0.13229 0.39687501,0.39687501 0 0 0 0.3968751,0.39688 z"/>
<path inkscape:connector-curvature="0" style="fill:#8f5315" id="path4231" d="m 1.7197912,294.88331 a 0.39687501,0.39687501 0 0 0 0.3968753,-0.39687 0.39687501,0.39687501 0 0 0 -0.023254,-0.13229 0.39687501,0.39687501 0 0 1 -0.3736206,0.26458 0.39687501,0.39687501 0 0 1 -0.3736205,-0.26458 0.39687501,0.39687501 0 0 0 -0.023254,0.13229 0.39687501,0.39687501 0 0 0 0.3968747,0.39687 z"/>
<path inkscape:connector-curvature="0" style="fill:#1aa3de;stroke-width:3.779527" id="path3362" d="m 2.9104165,295.8407 c -1.7e-6,0.1323 -1.3228734,0.21009 -1.3228795,-0.26457 -3.72e-5,-0.16388 0.1765522,-0.32853 0.387937,-0.16364 0.018266,0.0184 0.036608,0.036 0.055017,0.0528 0.022598,0.0206 0.045296,0.0399 0.068078,0.0582 0.037242,0.0298 0.074707,0.0566 0.1123192,0.0808 0.2335156,0.14998 0.4727189,0.1984 0.6995284,0.2365 z"/>
<path style="fill:#8f5315;stroke-width:3.779527" id="rect4190" d="M 17 2 L 17 3 L 20.478516 3 L 17 5.9921875 L 17 6 L 17 7 L 17.359375 7 L 22 7 L 22 6 L 18.521484 6 L 22 3.0097656 L 22 2 L 17 2 z M 12 4 L 12 5 L 14.421875 5 L 12 6.9824219 L 12 7 L 12 8 L 12.337891 8 L 16 8 L 16 7 L 13.558594 7 L 16 5.0019531 L 16 5 L 16 4 L 12 4 z " transform="matrix(0.26458334 0 0 0.26458334 0 291.17916)"/>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
<title>playing_normal</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="playing_normal" fill-rule="nonzero" fill="#303030">
<path d="M12,6 L13,6 L13,19 L12,19 L12,6 Z M8,11 L9,11 L9,19 L8,19 L8,11 Z M16,8 L17,8 L17,19 L16,19 L16,8 Z M20,13 L21,13 L21,19 L20,19 L20,13 Z M4,16 L5,16 L5,19 L4,19 L4,16 Z" id="Combined-Shape"></path>
</g>
</g>
</svg>
\ No newline at end of file
......@@ -273,7 +273,6 @@ Maui.ApplicationWindow
}
]
onSearchButtonClicked:
{
pageStack.currentIndex = 1
......@@ -281,6 +280,7 @@ Maui.ApplicationWindow
searchView.searchInput.forceActiveFocus()
}
footBar.visible: !mainlistEmpty
footBar.leftContent: Label
{
......@@ -362,7 +362,7 @@ Maui.ApplicationWindow
{
id: footerBg
clip : true
implicitHeight: floatingBar ? toolBarHeight * 0.8 : toolBarHeight
implicitHeight: floatingBar ? toolBarHeight * 0.7 : toolBarHeight
height: implicitHeight
color: darkViewBackgroundColor
radius: floatingBar ? Math.max(footBar.width, footBar.height) : 0
......@@ -894,6 +894,12 @@ Maui.ApplicationWindow
{
id: albumsView
grid.holder.emoji: "qrc:/assets/MusicBox.png"
grid.holder.isMask: false
grid.holder.title : "No Albums!"
grid.holder.body: "Add new music sources"
grid.holder.emojiSize: iconSizes.huge
Connections
{
target: albumsView
......@@ -946,6 +952,12 @@ Maui.ApplicationWindow
{
id: artistsView
grid.holder.emoji: "qrc:/assets/MusicBox.png"
grid.holder.isMask: false
grid.holder.title : "No Artists!"
grid.holder.body: "Add new music sources"
grid.holder.emojiSize: iconSizes.huge
Connections
{
target: artistsView
......
......@@ -9,7 +9,6 @@
<file>data_models/db_model.qml</file>
<file>db/script.sql</file>
<file>utils/Player.js</file>
<file>assets/face.png</file>
<file>db/Queries.js</file>
<file>utils/Help.js</file>
<file>view_models/BabeScrollBar.qml</file>
......@@ -28,21 +27,8 @@
<file>widgets/InfoView/LyricsView.qml</file>
<file>widgets/PlaylistsView/PlaylistsViewModel.qml</file>
<file>utils/Props.js</file>
<file>assets/face-sleeping.svg</file>
<file>assets/face-laughing.svg</file>
<file>assets/face-hug-left.svg</file>
<file>assets/face-crying.svg</file>
<file>assets/face-sleeping.png</file>
<file>assets/face-hug.png</file>
<file>widgets/SettingsView/SettingsView.qml</file>
<file>widgets/MyBeatView/LogginForm.qml</file>
<file>assets/music_img.jpg</file>
<file>assets/beat.png</file>
<file>assets/beat-banner3.png</file>
<file>assets/beat-banner2.png</file>
<file>assets/beat-banner.png</file>
<file>assets/beat2.png</file>
<file>assets/beat.svg</file>
<file>view_models/BabeMenu/BabeMenu.qml</file>
<file>view_models/BabeDialog/BabeMessage.qml</file>
<file>view_models/BabeDialog/BabeDialog.qml</file>
......@@ -79,5 +65,15 @@
<file>services/web/WebView.qml</file>
<file>services/web/WebView_A.qml</file>
<file>view_models/BabeTable/GroupDialog.qml</file>
<file>assets/Bread.png</file>
<file>assets/ElectricPlug.png</file>
<file>assets/Electricity.png</file>
<file>assets/USB.png</file>
<file>assets/Radio.png</file>
<file>assets/MusicBox.png</file>
<file>assets/Video tutorial.png</file>
<file>assets/BugSearch.png</file>
<file>assets/Astronaut.png</file>
<file>assets/MusicCloud.png</file>
</qresource>
</RCC>
......@@ -31,7 +31,7 @@ ColumnLayout
clip: true
separatorVisible: wideMode
initialPage: [playlistList, linkingResults]
initialPage: [playlistList, filterList]
defaultColumnWidth: Kirigami.Units.gridUnit * 15
interactive: false
......@@ -83,16 +83,14 @@ ColumnLayout
}
}
Page
{
id: linkingResults
anchors.fill: parent
clip: true
BabeTable
{
id: filterList
anchors.fill: parent
clip: true
quickPlayVisible: true
coverArtVisible: false
trackRating: true
......@@ -105,8 +103,13 @@ ColumnLayout
onExit: if(!linkingPage.wideMode)
linkingPage.currentIndex = 0
holder.message: "<h2>"+link.getDeviceName()+"</h2><p>Your linked playlist is empty</p>"
holder.emoji: "qrc:/assets/face-hug.png"
holder.emoji: "qrc:/assets/USB.png"
holder.isMask: false
holder.title : link.getDeviceName() ? link.getDeviceName() :
"Disconnected!"
holder.body: "Your linked playlist is empty"
holder.emojiSize: iconSizes.huge
appendBtn.visible: false
playAllBtn.visible: false
......@@ -138,7 +141,7 @@ ColumnLayout
onPulled: {}
}
}
}
}
......
......@@ -244,7 +244,11 @@ Page
headBarExit: true
headBarExitIcon: "edit-clear"
headBarTitle: "YouTube"
holder.message: "No YouTube results!"
holder.emoji: "qrc:/assets/Astronaut.png"
holder.isMask: false
holder.title : "No Results!"
holder.body: "Try with another query"
holder.emojiSize: iconSizes.huge
coverArtVisible: true
trackDuration: true
trackRating: true
......
......@@ -47,7 +47,6 @@ function refreshCollection(size)
{
if(!isMobile && size>0) bae.notify("Collection updated", size+" new tracks added...")
console.log("Clearing tables")
refreshTracks()
refreshAlbums()
refreshArtists()
......@@ -93,3 +92,8 @@ function searchFor(query)
searchView.runSearch(query)
}
function addSource()
{
sourcesDialog.open()
}
......@@ -4,13 +4,12 @@ import ".."
import org.kde.kirigami 2.0 as Kirigami
import org.kde.maui 1.0 as Maui
Pane
Maui.Page
{
id: gridPage
padding: space.big
headBarVisible: false
// readonly property int screenSize : bae.screenGeometry("width")*bae.screenGeometry("height");
// property int hintSize : Math.sqrt(root.width*root.height)*0.3
// property int hintSize : Math.sqrt(root.width*root.height)*0.3
property int albumCoverSize: iconSizes.enormous
readonly property int albumSpacing: albumCoverSize * 0.3 + space.small
......@@ -19,6 +18,7 @@ Pane
property bool albumCardVisible : true
property alias gridModel: gridModel
property alias grid: grid
property alias holder: holder
signal albumCoverClicked(string album, string artist)
signal albumCoverPressed(string album, string artist)
......@@ -40,8 +40,8 @@ Pane
Maui.Holder
{
id: holder
visible: grid.count === 0
message: "No albums..."
}
ListModel {id: gridModel}
......@@ -100,7 +100,7 @@ Pane
var album = grid.model.get(index).album
var artist = grid.model.get(index).artist
albumCoverPressed(album, artist)
}
}
}
}
......
......@@ -11,7 +11,6 @@ import ".."
BabeList
{
id: babeTableRoot
holder.message: "<h2>This list is empty</h2><p>You can sdd new music sources from the settings</p>"
// cacheBuffer : 300
focus: true
......
......@@ -61,6 +61,12 @@ Kirigami.PageRow
quickPlayVisible: true
focus: true
holder.emoji: "qrc:/assets/ElectricPlug.png"
holder.isMask: false
holder.title : "Oops!"
holder.body: "This list is empty"
holder.emojiSize: iconSizes.huge
onRowClicked:
{
albumsPageRoot.rowClicked(model.get(index))
......
......@@ -55,13 +55,13 @@ Item
id: cover
Layout.alignment: Qt.AlignBottom | Qt.AlignTop
Layout.fillWidth: true
Layout.preferredHeight: visible ? coverSize : 0
Layout.preferredHeight: !mainlistEmpty ? coverSize : 0
Layout.maximumHeight: coverSize
visible: !mainlistEmpty
visible: !mainlistEmpty
Rectangle
{
visible: cover.visible
visible: !mainlistEmpty
anchors.fill: parent
color: viewBackgroundColor
z: -999
......@@ -69,7 +69,7 @@ Item
Image
{
id: artwork
visible: true
visible: !mainlistEmpty
anchors.fill: parent
sourceSize.height: coverSize * 0.2
sourceSize.width: coverSize * 0.2
......@@ -110,7 +110,7 @@ Item
clip: false
width: parent.width
implicitHeight: toolBarHeightAlt
visible : !focusMode
visible : !focusMode && !mainlistEmpty
Layout.alignment: Qt.AlignBottom | Qt.AlignTop
Layout.fillWidth: true
......@@ -267,9 +267,11 @@ Item
trackRating: true
showIndicator : true
menuItemVisible: false
holder.message : "<h2>Meh!</h2><p>Start putting together your playlist!</p>"
holder.emoji: "qrc:/assets/face-sleeping.png"
holder.emoji: "qrc:/assets/Radio.png"
holder.isMask: false
holder.title : "Meh!"
holder.body: "Start putting together your playlist!"
holder.emojiSize: iconSizes.huge
onRowClicked: play(index)
onArtworkDoubleClicked: contextMenu.babeIt(index)
......
......@@ -121,8 +121,11 @@ Kirigami.PageRow
onExit: if(!playlistViewRoot.wideMode)
playlistViewRoot.currentIndex = 0
holder.message: "<h2>"+playlistViewModel.model.get(playlistViewModel.currentIndex).playlist+"</h2><p>Your playlist is empty,<br>start adding new music to it</p>"
holder.emoji: "qrc:/assets/face-hug.png"
holder.emoji: "qrc:/assets/Electricity.png"
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
headerMenu.menuItem: [
MenuItem
......
......@@ -96,7 +96,11 @@ Page
headBarVisible: true
headBarExit: true
headBarExitIcon: "edit-clear"
holder.message: "<h2>No search results!</h2><p>Try with another query</p>"
holder.emoji: "qrc:/assets/BugSearch.png"
holder.isMask: false
holder.title : "No search results!"
holder.body: "Try with another query"
holder.emojiSize: iconSizes.huge
coverArtVisible: true
trackDuration: true
trackRating: true
......
......@@ -16,7 +16,6 @@ BabePopup
bae.scanDir(folderUrl)
}
BabeMessage
{
id: confirmationDialog
......
......@@ -3,6 +3,7 @@ import org.kde.maui 1.0 as Maui
import "../view_models/BabeTable"
import "../view_models"
import "../db/Queries.js" as Q
import "../utils/Help.js" as H
BabeTable
{
......@@ -10,12 +11,18 @@ BabeTable
trackNumberVisible: false
trackDuration: true
trackRating: true
headBarVisible: true
headBarVisible: !holder.visible
headBarTitle: count + " tracks"
headBarExit: false
coverArtVisible: false
sortBy: "album"
holder.emoji: "qrc:/assets/MusicCloud.png"
holder.isMask: false
holder.title : "No Tracks!"
holder.body: "Add new music sources"
holder.emojiSize: iconSizes.huge
function populate()
{
var map = bae.get(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