Commit cf4d490f authored by Camilo higuita's avatar Camilo higuita

push latest changes

parent 8b75ccb7
......@@ -147,10 +147,10 @@ Maui.ApplicationWindow
}
}
// BabeNotify
// {
// id: babeNotify //todo
// }
// BabeNotify
// {
// id: babeNotify //todo
// }
/* UI */
......@@ -159,12 +159,15 @@ Maui.ApplicationWindow
headBarFGColor: altColorText
headBarBGColor: /*currentView === viewsIndex.vvave ? "#7e57c2" :*/ "#212121"
altColorText: darkTextColor
floatingBar: false
headBar.middleContent : [
Maui.ToolButton
{
iconName: "view-media-track"
height: headBar.height
showIndicator: currentView === viewsIndex.tracks
iconColor: currentView === viewsIndex.tracks ? babeColor : altColorText
onClicked: currentView = viewsIndex.tracks
text: qsTr("Tracks")
......@@ -176,6 +179,8 @@ Maui.ApplicationWindow
Maui.ToolButton
{
text: qsTr("Albums")
height: headBar.height
showIndicator: currentView === viewsIndex.albums
iconName: /*"album"*/ "view-media-album-cover"
iconColor: currentView === viewsIndex.albums ? babeColor : altColorText
onClicked: currentView = viewsIndex.albums
......@@ -187,6 +192,8 @@ Maui.ApplicationWindow
Maui.ToolButton
{
text: qsTr("Artists")
height: headBar.height
showIndicator: currentView === viewsIndex.artists
iconName: "view-media-artist"
iconColor: currentView === viewsIndex.artists ? babeColor : altColorText
onClicked: currentView = viewsIndex.artists
......@@ -198,6 +205,8 @@ Maui.ApplicationWindow
Maui.ToolButton
{
text: qsTr("Playlists")
height: headBar.height
showIndicator: currentView === viewsIndex.playlists
iconName: "view-media-playlist"
iconColor: currentView === viewsIndex.playlists ? babeColor : altColorText
onClicked: currentView = viewsIndex.playlists
......@@ -610,6 +619,7 @@ Maui.ApplicationWindow
{
id: _drawer
width: Kirigami.Units.gridUnit * 17
height: root.height - root.headBar.implicitHeight - root.footBar.implicitHeight
modal: !root.isWide
handleVisible: false
......@@ -702,7 +712,7 @@ Maui.ApplicationWindow
mainPlaylist.list.clear()
mainPlaylist.list.sortBy = Tracks.NONE
mainPlaylist.list.query = query
Player.playAll()
Player.playAll()
}
onPlayAll:
......@@ -806,7 +816,7 @@ Maui.ApplicationWindow
}
onPlaySync:
{
{
var query = playlistsView.playlistQuery
mainPlaylist.list.appendQuery(query)
Player.playAll()
......
......@@ -226,7 +226,7 @@ void TracksModel::searchQueries(const QStringList &queries)
if(!searchQuery.isEmpty())
{
this->list << this->db->getSearchedTracks(FMH::MODEL_KEY::WIKI, searchQuery);
this->list << this->db->getSearchedTracks(FMH::MODEL_KEY::TAG, searchQuery);
this->list << this->db->getSearchedTracks(FMH::MODEL_KEY::TAG, searchQuery);
this->list << this->db->getSearchedTracks(FMH::MODEL_KEY::LYRICS, searchQuery);
}
......@@ -306,7 +306,7 @@ bool TracksModel::fav(const int &index, const bool &value)
{
this->list[index][FMH::MODEL_KEY::FAV] = value ? "1" : "0";
emit this->updateModel(index, {FMH::MODEL_KEY::FAV});
qDebug()<< "FAVVING TRACKS"<< item;
qDebug()<< "FAVVING TRACKS"<< item;
return true;
}
......
......@@ -283,7 +283,7 @@ void Pulpo::startConnectionAsync(const QString &url, const QMap<QString,QString>
// downloader->deleteLater();
});
qDebug()<< "trying to get lyrics for "<< url;
qDebug()<< "trying to get AYNC DOWNLOADER for "<< url;
downloader->getArray(url);
}
}
......
......@@ -72,14 +72,11 @@ bool lastfm::setUpService(const PULPO::ONTOLOGY &ontology, const PULPO::INFO &in
bool lastfm::parseArtist()
{
QString xmlData(array);
QDomDocument doc;
if (!doc.setContent(xmlData)) return false;
QStringList artistTags;
QByteArray artistSimilarArt;
QStringList artistSimilar;
......
......@@ -23,6 +23,7 @@ StackView
{
anchors.fill: parent
id: browser
showEmblem: false
onItemClicked:
{
stack.push(filterList)
......
......@@ -78,6 +78,7 @@ ListView
Layout.fillWidth: true
Layout.fillHeight: true
text: model.title
color: textColor
font.pointSize: fontSizes.default
verticalAlignment: Qt.AlignBottom
clip: true
......@@ -95,6 +96,8 @@ ListView
font.pointSize: fontSizes.small
verticalAlignment: Qt.AlignTop
clip: true
color: textColor
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
......
......@@ -132,14 +132,14 @@ Maui.Page
Component.onCompleted:
{
var list = bae.lastPlaylist()
var n = list.length
var lastplaylist = bae.lastPlaylist()
var n = lastplaylist.length
if(n>0)
{
for(var i = 0; i < n; i++)
{
var where = "url = \""+list[i]+"\""
var where = "url = \""+lastplaylist[i]+"\""
var query = Q.GET.tracksWhere_.arg(where)
table.list.appendQuery(query);
}
......@@ -147,7 +147,7 @@ Maui.Page
{
where = "fav = 1"
query = Q.GET.tracksWhere_.arg(where)
list.appendQuery(query);
table.list.appendQuery(query);
}
// if(autoplay)
......
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