Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Vvave
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
6
Issues
6
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Maui
Vvave
Commits
c57cb5de
Commit
c57cb5de
authored
Mar 06, 2018
by
Camilo Higuita
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mods for bug testing
parent
a56ad35e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
19 deletions
+19
-19
db/collectionDB.cpp
db/collectionDB.cpp
+3
-0
main.cpp
main.cpp
+3
-3
main.qml
main.qml
+7
-7
settings/BabeSettings.cpp
settings/BabeSettings.cpp
+3
-6
settings/BabeSettings.h
settings/BabeSettings.h
+2
-2
view_models/BabeGrid/BabeAlbum.qml
view_models/BabeGrid/BabeAlbum.qml
+1
-1
No files found.
db/collectionDB.cpp
View file @
c57cb5de
...
...
@@ -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
];
...
...
main.cpp
View file @
c57cb5de
...
...
@@ -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"
)));
...
...
main.qml
View file @
c57cb5de
...
...
@@ -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
{
...
...
settings/BabeSettings.cpp
View file @
c57cb5de
...
...
@@ -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
);
}
settings/BabeSettings.h
View file @
c57cb5de
...
...
@@ -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
;
...
...
view_models/BabeGrid/BabeAlbum.qml
View file @
c57cb5de
...
...
@@ -30,7 +30,7 @@ ColumnLayout
visible
:
card
.
visible
horizontalOffset
:
0
verticalOffset
:
3
radius
:
0
radius
:
8.
0
samples
:
17
color
:
"
#80000000
"
source
:
card
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment