add new icon for Play Next menu item

This commit is contained in:
Drew Weymouth
2024-04-13 08:05:42 -07:00
parent 4df3a0ce8b
commit 0c7c1f10ab
7 changed files with 23 additions and 6 deletions
+5
View File
File diff suppressed because one or more lines are too long
+1
View File
@@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
fyne bundle -package res -prefix Res appicon-256.png > bundled.go fyne bundle -package res -prefix Res appicon-256.png > bundled.go
fyne bundle -append -prefix Res icons/coreui/playlist-add-next.svg >> bundled.go
fyne bundle -append -prefix Res icons/freepik/playbutton.png >> bundled.go fyne bundle -append -prefix Res icons/freepik/playbutton.png >> bundled.go
fyne bundle -append -prefix Res icons/publicdomain/disc.svg >> bundled.go fyne bundle -append -prefix Res icons/publicdomain/disc.svg >> bundled.go
fyne bundle -append -prefix Res icons/publicdomain/headphones.svg >> bundled.go fyne bundle -append -prefix Res icons/publicdomain/headphones.svg >> bundled.go
+3
View File
@@ -0,0 +1,3 @@
These icons are supplied by coreui on svgrepo.com and are available under the GPL license
https://www.svgrepo.com/page/licensing/#GPL
+7
View File
@@ -0,0 +1,7 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
<svg width="800px" height="800px" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" fill="#000000" transform="rotate(0)">
<g id="SVGRepo_bgCarrier" stroke-width="0"/>
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
<g id="SVGRepo_iconCarrier"> <rect width="208" height="32" x="256" y="152" fill="var(--ci-primary-color, #000000)" class="ci-primary"/> <rect width="288" height="32" x="176" y="256" fill="var(--ci-primary-color, #000000)" class="ci-primary"/> <rect width="288" height="32" x="176" y="360" fill="var(--ci-primary-color, #000000)" class="ci-primary"/> <polygon fill="var(--ci-primary-color, #000000)" points="192 152 128 152 128 88 96 88 96 152 32 152 32 184 96 184 96 248 128 248 128 184 192 184 192 152" class="ci-primary"/> </g>
</svg>

After

Width:  |  Height:  |  Size: 978 B

+1
View File
@@ -32,6 +32,7 @@ var (
NotFavoriteIcon fyne.Resource = theme.NewThemedResource(res.ResHeartOutlineSvg) NotFavoriteIcon fyne.Resource = theme.NewThemedResource(res.ResHeartOutlineSvg)
NowPlayingIcon fyne.Resource = theme.NewThemedResource(res.ResHeadphonesSvg) NowPlayingIcon fyne.Resource = theme.NewThemedResource(res.ResHeadphonesSvg)
PlaylistIcon fyne.Resource = theme.NewThemedResource(res.ResPlaylistSvg) PlaylistIcon fyne.Resource = theme.NewThemedResource(res.ResPlaylistSvg)
PlayNextIcon fyne.Resource = theme.NewThemedResource(res.ResPlaylistAddNextSvg)
ShareIcon fyne.Resource = theme.NewThemedResource(res.ResShareSvg) ShareIcon fyne.Resource = theme.NewThemedResource(res.ResShareSvg)
ShuffleIcon fyne.Resource = theme.NewThemedResource(res.ResShuffleSvg) ShuffleIcon fyne.Resource = theme.NewThemedResource(res.ResShuffleSvg)
TracksIcon fyne.Resource = theme.NewThemedResource(res.ResMusicnotesSvg) TracksIcon fyne.Resource = theme.NewThemedResource(res.ResMusicnotesSvg)
+3 -3
View File
@@ -404,12 +404,12 @@ func (g *GridView) showContextMenu(card *GridViewItem, pos fyne.Position) {
play.Icon = theme.MediaPlayIcon() play.Icon = theme.MediaPlayIcon()
shuffle := fyne.NewMenuItem("Shuffle", func() { g.onPlay(g.menuGridViewItemId, true) }) shuffle := fyne.NewMenuItem("Shuffle", func() { g.onPlay(g.menuGridViewItemId, true) })
shuffle.Icon = myTheme.ShuffleIcon shuffle.Icon = myTheme.ShuffleIcon
queue_next := fyne.NewMenuItem("Play next", func() { queueNext := fyne.NewMenuItem("Play next", func() {
if g.OnPlayNext != nil { if g.OnPlayNext != nil {
g.OnPlayNext(g.menuGridViewItemId) g.OnPlayNext(g.menuGridViewItemId)
} }
}) })
queue_next.Icon = theme.ContentAddIcon() queueNext.Icon = myTheme.PlayNextIcon
queue := fyne.NewMenuItem("Add to queue", func() { queue := fyne.NewMenuItem("Add to queue", func() {
if g.OnAddToQueue != nil { if g.OnAddToQueue != nil {
g.OnAddToQueue(g.menuGridViewItemId) g.OnAddToQueue(g.menuGridViewItemId)
@@ -432,7 +432,7 @@ func (g *GridView) showContextMenu(card *GridViewItem, pos fyne.Position) {
g.OnShare(g.menuGridViewItemId) g.OnShare(g.menuGridViewItemId)
}) })
g.shareMenuItem.Icon = myTheme.ShareIcon g.shareMenuItem.Icon = myTheme.ShareIcon
g.menu = widget.NewPopUpMenu(fyne.NewMenu("", play, shuffle, queue_next, queue, playlist, download, g.shareMenuItem), g.menu = widget.NewPopUpMenu(fyne.NewMenu("", play, shuffle, queueNext, queue, playlist, download, g.shareMenuItem),
fyne.CurrentApp().Driver().CanvasForObject(g)) fyne.CurrentApp().Driver().CanvasForObject(g))
} }
g.shareMenuItem.Disabled = g.DisableSharing g.shareMenuItem.Disabled = g.DisableSharing
+3 -3
View File
@@ -536,12 +536,12 @@ func (t *Tracklist) onShowContextMenu(e *fyne.PointEvent, trackIdx int) {
} }
}) })
shuffle.Icon = myTheme.ShuffleIcon shuffle.Icon = myTheme.ShuffleIcon
play_next := fyne.NewMenuItem("Play next", func() { playNext := fyne.NewMenuItem("Play next", func() {
if t.OnPlaySelection != nil { if t.OnPlaySelection != nil {
t.OnPlaySelectionNext(t.selectedTracks()) t.OnPlaySelectionNext(t.selectedTracks())
} }
}) })
play_next.Icon = theme.ContentAddIcon() playNext.Icon = myTheme.PlayNextIcon
add := fyne.NewMenuItem("Add to queue", func() { add := fyne.NewMenuItem("Add to queue", func() {
if t.OnPlaySelection != nil { if t.OnPlaySelection != nil {
t.OnAddToQueue(t.selectedTracks()) t.OnAddToQueue(t.selectedTracks())
@@ -553,7 +553,7 @@ func (t *Tracklist) onShowContextMenu(e *fyne.PointEvent, trackIdx int) {
}) })
t.songRadioMenuItem.Icon = myTheme.BroadcastIcon t.songRadioMenuItem.Icon = myTheme.BroadcastIcon
t.ctxMenu.Items = append(t.ctxMenu.Items, t.ctxMenu.Items = append(t.ctxMenu.Items,
play, shuffle, play_next, add, t.songRadioMenuItem) play, shuffle, playNext, add, t.songRadioMenuItem)
} }
playlist := fyne.NewMenuItem("Add to playlist...", func() { playlist := fyne.NewMenuItem("Add to playlist...", func() {
if t.OnAddToPlaylist != nil { if t.OnAddToPlaylist != nil {