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
6823eb7c
Commit
6823eb7c
authored
Jan 13, 2018
by
Camilo Higuita
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
watch out for repeated signal ids/names and fixes
parent
81829ef8
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
38 additions
and
31 deletions
+38
-31
main.qml
main.qml
+1
-6
view_models/BabeGrid.qml
view_models/BabeGrid.qml
+19
-9
view_models/BabeTable.qml
view_models/BabeTable.qml
+4
-4
view_models/TableDelegate.qml
view_models/TableDelegate.qml
+2
-2
widgets/AlbumsView.qml
widgets/AlbumsView.qml
+5
-5
widgets/ArtistsView.qml
widgets/ArtistsView.qml
+6
-5
widgets/InfoView.qml
widgets/InfoView.qml
+1
-0
No files found.
main.qml
View file @
6823eb7c
...
...
@@ -162,12 +162,7 @@ ApplicationWindow
{
id
:
tracksView
onRowClicked
:
Player
.
appendTrack
(
model
.
get
(
index
))
onPlayTrack
:
{
Player
.
appendTrack
(
model
.
get
(
index
))
Player
.
playAt
(
mainPlaylist
.
list
.
count
-
1
)
currentView
=
0
}
onQuickPlayTrack
:
Player
.
quickPlay
(
model
.
get
(
index
))
}
AlbumsView
...
...
view_models/BabeGrid.qml
View file @
6823eb7c
...
...
@@ -47,18 +47,28 @@ Pane
cellWidth
:
albumSize
+
albumSpacing
cellHeight
:
parseInt
(
albumSize
+
(
albumSize
*
0.6
))
highlightFollowsCurrentItem
:
false
focus
:
true
boundsBehavior
:
Flickable
.
StopAtBounds
flickableDirection
:
Flickable
.
AutoFlickDirection
snapMode
:
GridView
.
SnapToRow
// flow: GridView.FlowTopToBottom
// maximumFlickVelocity: albumSize*8
model
:
gridModel
SystemPalette
{
id
:
myPalette
;
colorGroup
:
SystemPalette
.
Active
}
// highlight: Rectangle
// {
// id: highlight
// width: albumSize
// height: albumSize
// color: myPalette.highlight
// radius: 4
// }
// highlight: Rectangle
// {
// id: highlight
// width: albumSize
// height: albumSize
// color: myPalette.highlight
// radius: 4
// }
// onWidthChanged:
// {
...
...
@@ -90,7 +100,7 @@ Pane
}
}
// ScrollBar.vertical: ScrollBar{
}
ScrollBar.vertical
:
ScrollBar
{
visible
:
!
(
Qt
.
platform
.
os
===
android
)
}
}
}
view_models/BabeTable.qml
View file @
6823eb7c
...
...
@@ -5,6 +5,7 @@ import QtQuick.Layouts 1.3
ListView
{
SystemPalette
{
id
:
myPalette
;
colorGroup
:
SystemPalette
.
Active
}
id
:
list
property
int
currentRow
:
-
1
property
bool
trackNumberVisible
...
...
@@ -13,7 +14,7 @@ ListView
property
alias
holder
:
holder
signal
rowClicked
(
int
index
)
signal
rowPressed
(
int
index
)
signal
p
layTrack
(
int
index
)
signal
quickP
layTrack
(
int
index
)
signal
queueTrack
(
int
index
)
width
:
320
...
...
@@ -27,7 +28,6 @@ ListView
focus
:
true
boundsBehavior
:
Flickable
.
StopAtBounds
id
:
list
flickableDirection
:
Flickable
.
AutoFlickDirection
snapMode
:
ListView
.
SnapToItem
...
...
@@ -141,7 +141,7 @@ ListView
onPressAndHold
:
{
if
(
Qt
.
platform
.
os
===
"
linux
"
)
p
layTrack
(
currentIndex
)
list
.
quickP
layTrack
(
currentIndex
)
}
onClicked
:
...
...
@@ -150,7 +150,7 @@ ListView
currentIndex
=
index
}
onPlay
Track
:
list
.
p
layTrack
(
index
)
onPlay
:
list
.
quickP
layTrack
(
index
)
onMenuClicked
:
{
currentRow
=
index
...
...
view_models/TableDelegate.qml
View file @
6823eb7c
...
...
@@ -7,7 +7,7 @@ import "../utils"
ItemDelegate
{
id
:
delegate
signal
play
Track
()
signal
play
()
signal
menuClicked
()
property
string
textColor
:
bae
.
foregroundColor
()
...
...
@@ -45,7 +45,7 @@ ItemDelegate
Layout.rowSpan
:
2
visible
:
quickPlay
Icon
{
text
:
MdiFont
.
Icon
.
playCircle
}
onClicked
:
playTrack
()
onClicked
:
delegate
.
play
()
}
Label
...
...
widgets/AlbumsView.qml
View file @
6823eb7c
...
...
@@ -60,13 +60,13 @@ BabeGrid
onClicked
:
{
drawer
.
close
()
var
data
=
albumsViewGrid
.
gridModel
.
get
(
albumsViewGrid
.
grid
.
currentIndex
)
var
query
=
"
select * from tracks where album =
\"
"
+
data
.
album
+
"
\"
and artist =
\"
"
+
data
.
artist
+
"
\"
order by track asc
"
var
tracks
=
bae
.
get
(
query
)
playAlbum
(
tracks
)
drawer
.
close
()
albumsViewGrid
.
playAlbum
(
tracks
)
}
}
...
...
@@ -84,7 +84,7 @@ BabeGrid
var
data
=
albumsView
.
gridModel
.
get
(
albumsViewGrid
.
grid
.
currentIndex
)
var
query
=
"
select * from tracks where album =
\"
"
+
data
.
album
+
"
\"
and artist =
\"
"
+
data
.
artist
+
"
\"
"
var
tracks
=
bae
.
get
(
query
)
appendAlbum
(
tracks
)
a
lbumsViewGrid
.
a
ppendAlbum
(
tracks
)
drawer
.
close
()
}
...
...
@@ -131,7 +131,7 @@ BabeGrid
albumsViewGrid
.
rowClicked
(
model
.
get
(
index
))
}
onPlayTrack
:
on
Quick
PlayTrack
:
{
drawer
.
close
()
albumsViewGrid
.
playTrack
(
model
.
get
(
index
))
...
...
widgets/ArtistsView.qml
View file @
6823eb7c
...
...
@@ -53,12 +53,13 @@ BabeGrid
onClicked
:
{
drawer
.
close
()
var
data
=
artistsViewGrid
.
gridModel
.
get
(
artistsViewGrid
.
grid
.
currentIndex
)
var
query
=
"
select * from tracks where artist =
\"
"
+
data
.
artist
+
"
\"
"
var
tracks
=
bae
.
get
(
query
)
playAlbum
(
tracks
)
drawer
.
close
()
}
}
ToolButton
...
...
@@ -125,20 +126,20 @@ BabeGrid
onRowClicked
:
{
artistsViewGrid
.
rowClicked
(
model
.
get
(
index
))
drawer
.
close
()
artistsViewGrid
.
rowClicked
(
model
.
get
(
index
))
}
onPlayTrack
:
on
Quick
PlayTrack
:
{
artistsViewGrid
.
playTrack
(
model
.
get
(
index
))
drawer
.
close
()
artistsViewGrid
.
playTrack
(
model
.
get
(
index
))
}
onQueueTrack
:
{
artistsViewGrid
.
queueTrack
(
model
.
get
(
index
))
drawer
.
close
()
artistsViewGrid
.
queueTrack
(
model
.
get
(
index
))
}
}
}
...
...
widgets/InfoView.qml
View file @
6823eb7c
...
...
@@ -37,6 +37,7 @@ Page
BabeHolder
{
id
:
lyricsHolder
anchors.fill
:
parent
visible
:
lyrics
?
false
:
true
message
:
"
Couldn't find the lyrics!
"
}
...
...
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