Commit 676bd6dc authored by Camilo Higuita's avatar Camilo Higuita

material style for beta release while kirigami issues are fixed and faster brainz fetching time

parent c57cb5de
...@@ -733,6 +733,9 @@ DB_LIST CollectionDB::getOnlineTracks(const KEY &orderBy, const BAE::W &order) ...@@ -733,6 +733,9 @@ DB_LIST CollectionDB::getOnlineTracks(const KEY &orderBy, const BAE::W &order)
QStringList CollectionDB::getSourcesFolders() QStringList CollectionDB::getSourcesFolders()
{ {
auto data = this->getDBData("select * from folders order by strftime(\"%s\", addDate) desc"); auto data = this->getDBData("select * from folders order by strftime(\"%s\", addDate) desc");
if(data.isEmpty()) return QStringList();
return this->dataToList(data, BAE::KEY::URL); return this->dataToList(data, BAE::KEY::URL);
} }
......
...@@ -76,8 +76,8 @@ int main(int argc, char *argv[]) ...@@ -76,8 +76,8 @@ int main(int argc, char *argv[])
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
KirigamiPlugin::getInstance().registerTypes(); KirigamiPlugin::getInstance().registerTypes();
QtWebView::initialize(); QtWebView::initialize();
//#else #else
// QQuickStyle::setStyle("Universal"); QQuickStyle::setStyle("material");
#endif #endif
engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
......
...@@ -203,7 +203,7 @@ Kirigami.ApplicationWindow ...@@ -203,7 +203,7 @@ Kirigami.ApplicationWindow
visible: true visible: true
currentIndex: currentView currentIndex: currentView
// onSettingsViewClicked: settingsDrawer.visible ? settingsDrawer.close() : settingsDrawer.open() onSettingsViewClicked: settingsDrawer.visible ? settingsDrawer.close() : settingsDrawer.open()
onTracksViewClicked: onTracksViewClicked:
{ {
...@@ -533,12 +533,12 @@ Kirigami.ApplicationWindow ...@@ -533,12 +533,12 @@ Kirigami.ApplicationWindow
z: -999 z: -999
} }
// globalDrawer: SettingsView globalDrawer: SettingsView
// { {
// id: settingsDrawer id: settingsDrawer
// // contentItem.implicitWidth: columnWidth // contentItem.implicitWidth: columnWidth
// onIconSizeChanged: toolBarIconSize = size onIconSizeChanged: toolBarIconSize = size
// } }
Item Item
{ {
......
...@@ -88,7 +88,7 @@ BabeSettings::BabeSettings(QObject *parent) : QObject(parent) ...@@ -88,7 +88,7 @@ BabeSettings::BabeSettings(QObject *parent) : QObject(parent)
{ {
bDebug::Instance()->msg("Finished inserting into DB "+QString::number(size)+" tracks"); bDebug::Instance()->msg("Finished inserting into DB "+QString::number(size)+" tracks");
bDebug::Instance()->msg("Starting Brainz with interval: " + QString::number(BAE::SEG::ONEHALF)); bDebug::Instance()->msg("Starting Brainz with interval: " + QString::number(BAE::SEG::ONEHALF));
this->startBrainz(true, BAE::SEG::ONEHALF); this->startBrainz(true, BAE::SEG::HALF);
}else }else
this->startBrainz(BAE::loadSettings("BRAINZ", "BABE", false).toBool(), BAE::SEG::THREE); this->startBrainz(BAE::loadSettings("BRAINZ", "BABE", false).toBool(), BAE::SEG::THREE);
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#define BABE_VERSION_STR "0.1.0" #define BABE_VERSION_STR "0.1.0"
#define BABE_VERSION KDE_MAKE_VERSION(@BABE_MAJOR_VERSION@,@BABE_MINOR_VERSION@,@BABE_PATCH_VERSION@) #define BABE_VERSION KDE_MAKE_VERSION(0,1,0)
using namespace std; using namespace std;
...@@ -54,6 +54,7 @@ inline bool isMobile() ...@@ -54,6 +54,7 @@ inline bool isMobile()
enum SEG enum SEG
{ {
HALF = 500,
ONE = 1000, ONE = 1000,
ONEHALF = 1500, ONEHALF = 1500,
TWO = 2000, TWO = 2000,
......
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