diff --git a/backend/config.go b/backend/config.go index 2696fa1..ea77b01 100644 --- a/backend/config.go +++ b/backend/config.go @@ -24,10 +24,20 @@ type AlbumPageConfig struct { TracklistColumns []string } +type NowPlayingPageConfig struct { + TracklistColumns []string +} + +type PlaylistPageConfig struct { + TracklistColumns []string +} + type Config struct { - Application AppConfig - Servers []*ServerConfig - AlbumPage AlbumPageConfig + Application AppConfig + Servers []*ServerConfig + AlbumPage AlbumPageConfig + NowPlayingPage NowPlayingPageConfig + PlaylistPage PlaylistPageConfig } func DefaultConfig() *Config { @@ -39,6 +49,12 @@ func DefaultConfig() *Config { AlbumPage: AlbumPageConfig{ TracklistColumns: []string{"Artist", "Time", "Plays"}, }, + NowPlayingPage: NowPlayingPageConfig{ + TracklistColumns: []string{"Artist", "Album", "Time"}, + }, + PlaylistPage: PlaylistPageConfig{ + TracklistColumns: []string{"Artist", "Album", "Time", "Plays"}, + }, } } diff --git a/ui/browsing/nowplayingpage.go b/ui/browsing/nowplayingpage.go index 68fa924..827b334 100644 --- a/ui/browsing/nowplayingpage.go +++ b/ui/browsing/nowplayingpage.go @@ -25,6 +25,7 @@ type NowPlayingPage struct { type nowPlayingPageState struct { contr controller.Controller + conf *backend.NowPlayingPageConfig sm *backend.ServerManager pm *backend.PlaybackManager nav func(Route) @@ -32,15 +33,15 @@ type nowPlayingPageState struct { func NewNowPlayingPage( contr controller.Controller, + conf *backend.NowPlayingPageConfig, sm *backend.ServerManager, pm *backend.PlaybackManager, nav func(Route), ) *NowPlayingPage { - a := &NowPlayingPage{nowPlayingPageState: nowPlayingPageState{contr: contr, sm: sm, pm: pm, nav: nav}} + a := &NowPlayingPage{nowPlayingPageState: nowPlayingPageState{contr: contr, conf: conf, sm: sm, pm: pm, nav: nav}} a.ExtendBaseWidget(a) a.tracklist = widgets.NewTracklist(nil) - a.tracklist.SetVisibleColumns([]string{ - widgets.ColumnArtist, widgets.ColumnAlbum, widgets.ColumnTime}) + a.tracklist.SetVisibleColumns(conf.TracklistColumns) a.tracklist.AutoNumber = true a.tracklist.DisablePlaybackMenu = true a.tracklist.OnPlayTrackAt = a.onPlayTrackAt @@ -61,6 +62,7 @@ func (a *NowPlayingPage) CreateRenderer() fyne.WidgetRenderer { } func (a *NowPlayingPage) Save() SavedPage { + a.conf.TracklistColumns = a.tracklist.VisibleColumns() nps := a.nowPlayingPageState return &nps } @@ -109,5 +111,5 @@ func (a *NowPlayingPage) load() { } func (s *nowPlayingPageState) Restore() Page { - return NewNowPlayingPage(s.contr, s.sm, s.pm, s.nav) + return NewNowPlayingPage(s.contr, s.conf, s.sm, s.pm, s.nav) } diff --git a/ui/browsing/playlistpage.go b/ui/browsing/playlistpage.go index 31a63c2..56ef385 100644 --- a/ui/browsing/playlistpage.go +++ b/ui/browsing/playlistpage.go @@ -30,6 +30,7 @@ type PlaylistPage struct { type playlistPageState struct { playlistID string + conf *backend.PlaylistPageConfig contr controller.Controller sm *backend.ServerManager pm *backend.PlaybackManager @@ -39,18 +40,18 @@ type playlistPageState struct { func NewPlaylistPage( playlistID string, + conf *backend.PlaylistPageConfig, contr controller.Controller, sm *backend.ServerManager, pm *backend.PlaybackManager, im *backend.ImageManager, nav func(Route), ) *PlaylistPage { - a := &PlaylistPage{playlistPageState: playlistPageState{playlistID: playlistID, contr: contr, sm: sm, pm: pm, im: im}} + a := &PlaylistPage{playlistPageState: playlistPageState{playlistID: playlistID, conf: conf, contr: contr, sm: sm, pm: pm, im: im}} a.ExtendBaseWidget(a) a.header = NewPlaylistPageHeader(a) a.tracklist = widgets.NewTracklist(nil) - a.tracklist.SetVisibleColumns([]string{ - widgets.ColumnArtist, widgets.ColumnAlbum, widgets.ColumnTime, widgets.ColumnPlays}) + a.tracklist.SetVisibleColumns(conf.TracklistColumns) a.tracklist.AutoNumber = true a.tracklist.AuxiliaryMenuItems = []*fyne.MenuItem{ fyne.NewMenuItem("Remove from playlist", a.onRemoveSelectedFromPlaylist), @@ -76,6 +77,7 @@ func (a *PlaylistPage) CreateRenderer() fyne.WidgetRenderer { } func (a *PlaylistPage) Save() SavedPage { + a.conf.TracklistColumns = a.tracklist.VisibleColumns() p := a.playlistPageState return &p } @@ -218,5 +220,5 @@ func (a *PlaylistPageHeader) formatPlaylistTrackTimeStr(p *subsonic.Playlist) st } func (s *playlistPageState) Restore() Page { - return NewPlaylistPage(s.playlistID, s.contr, s.sm, s.pm, s.im, s.nav) + return NewPlaylistPage(s.playlistID, s.conf, s.contr, s.sm, s.pm, s.im, s.nav) } diff --git a/ui/browsing/router.go b/ui/browsing/router.go index e5138e2..d9a5c6b 100644 --- a/ui/browsing/router.go +++ b/ui/browsing/router.go @@ -101,9 +101,9 @@ func (r Router) CreatePage(rte Route) Page { case Genres: return NewArtistsGenresPage(true, r.App.ServerManager, r.OpenRoute) case NowPlaying: - return NewNowPlayingPage(r.Controller, r.App.ServerManager, r.App.PlaybackManager, r.OpenRoute) + return NewNowPlayingPage(r.Controller, &r.App.Config.NowPlayingPage, r.App.ServerManager, r.App.PlaybackManager, r.OpenRoute) case Playlist: - return NewPlaylistPage(rte.Arg, r.Controller, r.App.ServerManager, r.App.PlaybackManager, r.App.ImageManager, r.OpenRoute) + return NewPlaylistPage(rte.Arg, &r.App.Config.PlaylistPage, r.Controller, r.App.ServerManager, r.App.PlaybackManager, r.App.ImageManager, r.OpenRoute) case Playlists: return NewPlaylistsPage(r.App.ServerManager, r.OpenRoute) }