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 c57cb5de authored by Camilo Higuita's avatar Camilo Higuita

mods for bug testing

parent a56ad35e
......@@ -27,6 +27,7 @@ using namespace BAE;
CollectionDB::CollectionDB(QObject *parent) : QObject(parent)
{
this->name = QUuid::createUuid().toString();
if(!BAE::fileExists(BAE::CollectionDBPath + BAE::DBName))
{
this->openDB(this->name);
......@@ -589,6 +590,8 @@ QVariantList CollectionDB::getDBDataQML(const QString &queryTxt)
QStringList CollectionDB::dataToList(const DB_LIST &list, const KEY &key)
{
if(list.isEmpty()) return QStringList();
QStringList response;
for(auto track : list)
response << track[key];
......
......@@ -50,8 +50,8 @@ int main(int argc, char *argv[])
return 0;
}
Player player;
Babe bae;
Player player;
/* Services */
YouTube youtube;
......@@ -76,8 +76,8 @@ int main(int argc, char *argv[])
#ifdef Q_OS_ANDROID
KirigamiPlugin::getInstance().registerTypes();
QtWebView::initialize();
#else
QQuickStyle::setStyle("nomad");
//#else
// QQuickStyle::setStyle("Universal");
#endif
engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
......
......@@ -203,7 +203,7 @@ Kirigami.ApplicationWindow
visible: true
currentIndex: currentView
onSettingsViewClicked: settingsDrawer.visible ? settingsDrawer.close() : settingsDrawer.open()
// onSettingsViewClicked: settingsDrawer.visible ? settingsDrawer.close() : settingsDrawer.open()
onTracksViewClicked:
{
......@@ -533,12 +533,12 @@ Kirigami.ApplicationWindow
z: -999
}
globalDrawer: SettingsView
{
id: settingsDrawer
// contentItem.implicitWidth: columnWidth
onIconSizeChanged: toolBarIconSize = size
}
// globalDrawer: SettingsView
// {
// id: settingsDrawer
// // contentItem.implicitWidth: columnWidth
// onIconSizeChanged: toolBarIconSize = size
// }
Item
{
......
......@@ -18,7 +18,6 @@
#include "BabeSettings.h"
#include "../db/collectionDB.h"
#include "fileloader.h"
#include "../utils/brain.h"
#include "../services/local/socket.h"
#include "../services/local/youtubedl.h"
......@@ -27,8 +26,7 @@
BabeSettings::BabeSettings(QObject *parent) : QObject(parent)
{
this->connection = new CollectionDB(this);
this->fileLoader = new FileLoader;
this->connection = new CollectionDB(this);
this->brainDeamon = new Brain;
this->ytFetch = new youtubedl(this);
this->babeSocket = new Socket(static_cast<quint16>(BAE::BabePort.toInt()),this);
......@@ -84,7 +82,7 @@ BabeSettings::BabeSettings(QObject *parent) : QObject(parent)
emit this->refreshATable(type);
});
connect(this->fileLoader, &FileLoader::finished,[this](int size)
connect(&this->fileLoader, &FileLoader::finished,[this](int size)
{
if(size > 0)
{
......@@ -104,7 +102,6 @@ BabeSettings::BabeSettings(QObject *parent) : QObject(parent)
BabeSettings::~BabeSettings()
{
qDebug()<<"DELETING SETTINGS";
delete fileLoader;
delete brainDeamon;
}
......@@ -145,5 +142,5 @@ void BabeSettings::populateDB(const QStringList &paths)
for(auto path : newPaths)
if(path.startsWith("file://"))
path.replace("file://", "");
fileLoader->requestPaths(newPaths);
fileLoader.requestPaths(newPaths);
}
......@@ -14,9 +14,9 @@
#include <QMovie>
#include <QFileSystemWatcher>
#include <QTimer>
#include "fileloader.h"
#include "../utils/bae.h"
class FileLoader;
class CollectionDB;
class youtubedl;
class Socket;
......@@ -40,7 +40,7 @@ public slots:
void populateDB(const QStringList &paths);
private:
FileLoader *fileLoader;
FileLoader fileLoader;
CollectionDB *connection;
Brain *brainDeamon;
youtubedl *ytFetch;
......
......@@ -30,7 +30,7 @@ ColumnLayout
visible: card.visible
horizontalOffset: 0
verticalOffset: 3
radius: 0
radius: 8.0
samples: 17
color: "#80000000"
source: card
......
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