Commit f6be1df4 authored by camilo higuita's avatar camilo higuita

cleaning up for release... again

parent b6861a37
......@@ -40,17 +40,17 @@ add_executable(vvave
services/local/player.cpp
services/local/youtubedl.cpp
# services/local/linking.cpp
services/local/socket.cpp
# services/local/socket.cpp
services/web/youtube.cpp
services/web/NextCloud/nextmusic.cpp
services/web/abstractmusicprovider.cpp
# services/web/NextCloud/nextmusic.cpp
# services/web/abstractmusicprovider.cpp
# services/web/Spotify/spotify.cpp
db/collectionDB.cpp
# utils/brain.cpp
models/tracks/tracksmodel.cpp
models/playlists/playlistsmodel.cpp
models/albums/albumsmodel.cpp
models/cloud/cloud.cpp
# models/cloud/cloud.cpp
)
if (ANDROID)
......
......@@ -30,14 +30,12 @@
#include "utils/bae.h"
#include "services/web/youtube.h"
//#include "services/web/Spotify/spotify.h"
//#include "services/local/linking.h"
#include "services/local/player.h"
#include "models/tracks/tracksmodel.h"
#include "models/albums/albumsmodel.h"
#include "models/playlists/playlistsmodel.h"
#include "models/cloud/cloud.h"
//#include "models/cloud/cloud.h"
#ifdef Q_OS_ANDROID
Q_DECL_EXPORT
......@@ -49,8 +47,6 @@ int main(int argc, char *argv[])
#ifdef Q_OS_ANDROID
QGuiApplication app(argc, argv);
// QGuiApplication::styleHints()->setMousePressAndHoldInterval(1000); // in [ms]
// QGuiApplication::styleHints()->setMouseDoubleClickInterval(250);
if (!MAUIAndroid::checkRunTimePermissions())
return -1;
#else
......@@ -101,7 +97,7 @@ int main(int argc, char *argv[])
qmlRegisterType<TracksModel>("TracksList", 1, 0, "Tracks");
qmlRegisterType<PlaylistsModel>("PlaylistsList", 1, 0, "Playlists");
qmlRegisterType<AlbumsModel>("AlbumsList", 1, 0, "Albums");
qmlRegisterType<Cloud>("CloudList", 1, 0, "Cloud");
// qmlRegisterType<Cloud>("CloudList", 1, 0, "Cloud");
qmlRegisterType<Player>("Player", 1, 0, "Player");
......
......@@ -11,7 +11,7 @@ import "widgets/PlaylistsView"
import "widgets/MainPlaylist"
import "widgets/SettingsView"
import "widgets/SearchView"
import "widgets/CloudView"
//import "widgets/CloudView"
import "view_models"
import "view_models/BabeTable"
......@@ -149,11 +149,11 @@ Maui.ApplicationWindow
icon.name: "folder"
},
Action
{
text: qsTr("Cloud")
icon.name: "folder-cloud"
},
// Action
// {
// text: qsTr("Cloud")
// icon.name: "folder-cloud"
// },
Action
{
......@@ -730,14 +730,14 @@ Maui.ApplicationWindow
}
}
Loader
{
active: SwipeView.isCurrentItem || SwipeView.isNextItem || SwipeView.isPreviousItem || item
sourceComponent: CloudView
{
id: cloudView
}
}
// Loader
// {
// active: SwipeView.isCurrentItem || SwipeView.isNextItem || SwipeView.isPreviousItem || item
// sourceComponent: CloudView
// {
// id: cloudView
// }
// }
Loader
{
......
......@@ -122,8 +122,8 @@ void AlbumsModel::setList()
this->sortList();
emit this->postListChanged();
if(this->query == AlbumsModel::QUERY::ALBUMS)
this->fetchInformation();
//if(this->query == AlbumsModel::QUERY::ALBUMS)
//this->fetchInformation();
}
void AlbumsModel::fetchInformation()
......
......@@ -27,7 +27,7 @@ linux:unix:!android {
#DEFAULT COMPONENTS DEFINITIONS
DEFINES *= \
COMPONENT_EDITOR \
COMPONENT_ACCOUNTS \
# COMPONENT_ACCOUNTS \
COMPONENT_FM \
COMPONENT_TERMINAL \
COMPONENT_TAGGING \
......@@ -67,13 +67,13 @@ SOURCES += main.cpp \
vvave.cpp \
services/local/youtubedl.cpp \
# services/local/linking.cpp \
services/web/Spotify/spotify.cpp \
# services/web/Spotify/spotify.cpp \
models/tracks/tracksmodel.cpp \
models/playlists/playlistsmodel.cpp \
models/albums/albumsmodel.cpp \
services/web/NextCloud/nextmusic.cpp \
services/web/abstractmusicprovider.cpp \
models/cloud/cloud.cpp
# services/web/NextCloud/nextmusic.cpp \
# services/web/abstractmusicprovider.cpp \
# models/cloud/cloud.cpp
RESOURCES += qml.qrc \
......@@ -97,17 +97,17 @@ HEADERS += \
vvave.h \
services/local/youtubedl.h \
# services/local/linking.h \
services/web/Spotify/spotify.h \
# services/web/Spotify/spotify.h \
models/tracks/tracksmodel.h \
models/playlists/playlistsmodel.h \
models/albums/albumsmodel.h \
services/web/NextCloud/nextmusic.h \
services/web/abstractmusicprovider.h \
models/cloud/cloud.h
# services/web/NextCloud/nextmusic.h \
# services/web/abstractmusicprovider.h \
# models/cloud/cloud.h
INCLUDEPATH += \
$$PWD/services/web \
$$PWD/services/web/NextCloud
#INCLUDEPATH += \
# $$PWD/services/web \
# $$PWD/services/web/NextCloud
include(install.pri)
......
......@@ -79,6 +79,11 @@ Maui.Page
}
}
middleContent: Label
{
text: qsTr("Now playing")
}
leftContent: ToolButton
{
icon.name: "document-save"
......
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