diff -Nru gnome-music-41.1/data/icons/music-artist-symbolic.svg gnome-music-42.1/data/icons/music-artist-symbolic.svg --- gnome-music-41.1/data/icons/music-artist-symbolic.svg 1970-01-01 00:00:00.000000000 +0000 +++ gnome-music-42.1/data/icons/music-artist-symbolic.svg 2022-04-25 07:23:02.000000000 +0000 @@ -0,0 +1 @@ + \ No newline at end of file diff -Nru gnome-music-41.1/data/icons/music-playlist-symbolic.svg gnome-music-42.1/data/icons/music-playlist-symbolic.svg --- gnome-music-41.1/data/icons/music-playlist-symbolic.svg 1970-01-01 00:00:00.000000000 +0000 +++ gnome-music-42.1/data/icons/music-playlist-symbolic.svg 2022-04-25 07:23:02.000000000 +0000 @@ -0,0 +1 @@ + \ No newline at end of file diff -Nru gnome-music-41.1/data/icons/playlist2-symbolic.svg gnome-music-42.1/data/icons/playlist2-symbolic.svg --- gnome-music-41.1/data/icons/playlist2-symbolic.svg 2022-04-25 09:18:06.000000000 +0000 +++ gnome-music-42.1/data/icons/playlist2-symbolic.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ - - - - - - diff -Nru gnome-music-41.1/data/icons/welcome-music.svg gnome-music-42.1/data/icons/welcome-music.svg --- gnome-music-41.1/data/icons/welcome-music.svg 2022-04-25 09:18:06.000000000 +0000 +++ gnome-music-42.1/data/icons/welcome-music.svg 2022-04-25 07:23:02.000000000 +0000 @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff -Nru gnome-music-41.1/data/meson.build gnome-music-42.1/data/meson.build --- gnome-music-41.1/data/meson.build 2022-04-25 09:18:06.000000000 +0000 +++ gnome-music-42.1/data/meson.build 2022-04-25 07:23:02.000000000 +0000 @@ -10,10 +10,13 @@ dependencies: about_dialog ) +schema_src = PROJECT_RDNN_NAME + '.gschema.xml' +gnome.compile_schemas(build_by_default: true, depend_files: files(schema_src)) + # Installing the schema file install_data( - PROJECT_RDNN_NAME + '.gschema.xml', - install_dir: 'share/glib-2.0/schemas' + schema_src, + install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas') ) # Merging the translations with the desktop file @@ -26,7 +29,7 @@ input: PROJECT_RDNN_NAME + '.desktop.in.in', configuration: desktop_conf), output: APPLICATION_ID + '.desktop', - po_dir: join_paths(meson.source_root(), 'po'), + po_dir: join_paths(meson.project_source_root(), 'po'), install: true, install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'applications') ) @@ -53,7 +56,7 @@ configuration: appdata_conf ), output: APPLICATION_ID + '.appdata.xml', - po_dir: join_paths(meson.source_root(), 'po'), + po_dir: join_paths(meson.project_source_root(), 'po'), install: true, install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'metainfo') ) diff -Nru gnome-music-41.1/data/org.gnome.Music.appdata.xml.in.in gnome-music-42.1/data/org.gnome.Music.appdata.xml.in.in --- gnome-music-41.1/data/org.gnome.Music.appdata.xml.in.in 2022-04-25 09:18:06.000000000 +0000 +++ gnome-music-42.1/data/org.gnome.Music.appdata.xml.in.in 2022-04-25 07:23:02.000000000 +0000 @@ -3,7 +3,7 @@ @appid@.desktop CC0-1.0 GPL-2.0+ and LGPL-2.0+ and CC-BY-SA-4.0 - GNOME Music + Music Play and organize your music collection

@@ -15,29 +15,37 @@ - https://gitlab.gnome.org/GNOME/gnome-music/raw/master/data/screenshots/gnome-music-1.png + https://gitlab.gnome.org/GNOME/gnome-music/raw/HEAD/data/screenshots/gnome-music-1.png - https://gitlab.gnome.org/GNOME/gnome-music/raw/master/data/screenshots/gnome-music-2.png + https://gitlab.gnome.org/GNOME/gnome-music/raw/HEAD/data/screenshots/gnome-music-2.png - https://gitlab.gnome.org/GNOME/gnome-music/raw/master/data/screenshots/gnome-music-3.png + https://gitlab.gnome.org/GNOME/gnome-music/raw/HEAD/data/screenshots/gnome-music-3.png - https://gitlab.gnome.org/GNOME/gnome-music/raw/master/data/screenshots/gnome-music-4.png + https://gitlab.gnome.org/GNOME/gnome-music/raw/HEAD/data/screenshots/gnome-music-4.png - +

+ + +

+ Music has been ported to GTK-4. This brings some performance + improvements for larger collections. +

+ +

diff -Nru gnome-music-41.1/data/org.gnome.Music.css gnome-music-42.1/data/org.gnome.Music.css --- gnome-music-41.1/data/org.gnome.Music.css 2022-04-25 09:18:06.000000000 +0000 +++ gnome-music-42.1/data/org.gnome.Music.css 1970-01-01 00:00:00.000000000 +0000 @@ -1,141 +0,0 @@ -/* AlbumCover */ -.albumcover-title-label { - color: @theme_fg_color; -} - -.albumcover-artist-label { - font-size: smaller; - color: @theme_fg_color; -} - -/* By default in Adwaita dark this is not transparent */ -.tile { - background-color: transparent; -} - -.playlist-icon { - padding: 10px; - border-radius: 50%; - background-color: alpha(@theme_fg_color, 0.1); -} - -.disc-label { - color: alpha(@theme_fg_color, 0.8); - padding: 12px 0; -} - -/* PlayerToolbar */ -.border-solid { - border-style: solid; -} - -.semi-circular { - border-radius: 20px; - -gtk-outline-radius: 20px; -} - -.semi-circular:hover { - border-top-width: 0px; - border-bottom-width: 0px; - border-left-width: 0px; - border-right-width: 0px; -} - -.pill { - border-radius: 9999px; - -gtk-outline-radius: 9999px; -} - -.smooth-scale { - padding-top: 0px; - padding-bottom: 0px; -} - -/* FIXME: Remove once songsview is ported to the new style */ -.songs-list-old { - box-shadow: inset 0 -1px shade(@borders, 1.30); - background-color: @theme_bg_color; -} - -.songs-list-old:selected { - color: @theme_fg_color; - border-color: mix(@theme_fg_color, @theme_bg_color, 0.5); -} - -/* We use background-image as a workaround on the StarImage widget to - enable transitions between the non-starred and starred icons. */ -.star { - background-image: -gtk-icontheme('non-starred-symbolic'); - color: alpha(@theme_fg_color, 0.3); - transition: 100ms linear; -} - -.star:hover { - color: alpha(@theme_fg_color, 0.6); -} - -.star:selected { - background-image: -gtk-icontheme('starred-symbolic'); - color: @theme_selected_bg_color; - transition: 100ms linear; -} - -.content-view { background-color: @theme_bg; } - -.grey-image { - color: alpha(@theme_fg_color, 0.3); -} - -/* Used in AlbumWidget and ArtistAlbumsWidget */ -.playing-song-label { - font-weight: bold; -} - -/* TwoLineTip */ -.tooltip-title { - font-weight: bold; -} - -/* Lists style */ - -/* workaround to avoid a black background issue -in AlbumWidget and PlaylistsView -https://gitlab.gnome.org/GNOME/gtk/issues/694 -*/ -list { - background-color: transparent; -} - -.playlistdialog-row:selected { - color: @theme_fg_color; - background-color: @theme_insensitive_bg_color; -} - -.playlistdialog-row:selected label { - color: @theme_text_color; -} - -/* SearchView */ -.search-header { - font-weight: bold; -} - -/* dnd icon for SongWidget */ -.drag-handle { - color: alpha(@theme_fg_color, 0.4); -} - -.drag-handle:backdrop { - color: alpha(@theme_unfocused_fg_color, 0.4); -} - -/* Last.fm dialog */ -.lastfm-status-label { - font-weight: bold; -} - -/* SongWidget */ - -.songwidget { - padding: 12px; -} diff -Nru gnome-music-41.1/data/org.gnome.Music.gresource.xml gnome-music-42.1/data/org.gnome.Music.gresource.xml --- gnome-music-41.1/data/org.gnome.Music.gresource.xml 2022-04-25 09:18:06.000000000 +0000 +++ gnome-music-42.1/data/org.gnome.Music.gresource.xml 2022-04-25 07:23:02.000000000 +0000 @@ -2,11 +2,11 @@ ui/help-overlay.ui - org.gnome.Music.css - icons/playlist2-symbolic.svg + style.css icons/welcome-music.svg ui/AboutDialog.ui ui/AlbumCover.ui + ui/AlbumCoverListItem.ui ui/AlbumWidget.ui ui/AlbumsView.ui ui/ArtistAlbumsWidget.ui @@ -15,18 +15,13 @@ ui/ArtistsView.ui ui/ArtistTile.ui ui/DiscBox.ui - ui/DropDown.ui ui/EmptyView.ui - ui/FilterView.ui ui/HeaderBar.ui ui/LastfmDialog.ui - ui/LoadingNotification.ui - ui/NotificationsPopup.ui ui/PlayerToolbar.ui ui/PlaylistControls.ui ui/PlaylistDialog.ui ui/PlaylistDialogRow.ui - ui/PlaylistNotification.ui ui/PlaylistsView.ui ui/PlaylistsWidget.ui ui/PlaylistTile.ui @@ -34,10 +29,15 @@ ui/SearchView.ui ui/SelectionBarMenuButton.ui ui/SelectionToolbar.ui + ui/SongListItem.ui ui/SongsView.ui ui/SongWidget.ui ui/SongWidgetMenu.ui ui/TwoLineTip.ui ui/Window.ui + + icons/music-playlist-symbolic.svg + icons/music-artist-symbolic.svg + diff -Nru gnome-music-41.1/data/org.gnome.Music.gschema.xml gnome-music-42.1/data/org.gnome.Music.gschema.xml --- gnome-music-41.1/data/org.gnome.Music.gschema.xml 2022-04-25 09:18:06.000000000 +0000 +++ gnome-music-42.1/data/org.gnome.Music.gschema.xml 2022-04-25 07:23:02.000000000 +0000 @@ -12,11 +12,6 @@

Window size Window size (width and height). - - [] - Window position - Window position (x and y). - true Window maximized Binary files /tmp/tmpx6381fah/JC27ZqTPCV/gnome-music-41.1/data/screenshots/gnome-music-1.png and /tmp/tmpx6381fah/SItH5pgzgD/gnome-music-42.1/data/screenshots/gnome-music-1.png differ Binary files /tmp/tmpx6381fah/JC27ZqTPCV/gnome-music-41.1/data/screenshots/gnome-music-2.png and /tmp/tmpx6381fah/SItH5pgzgD/gnome-music-42.1/data/screenshots/gnome-music-2.png differ Binary files /tmp/tmpx6381fah/JC27ZqTPCV/gnome-music-41.1/data/screenshots/gnome-music-3.png and /tmp/tmpx6381fah/SItH5pgzgD/gnome-music-42.1/data/screenshots/gnome-music-3.png differ Binary files /tmp/tmpx6381fah/JC27ZqTPCV/gnome-music-41.1/data/screenshots/gnome-music-4.png and /tmp/tmpx6381fah/SItH5pgzgD/gnome-music-42.1/data/screenshots/gnome-music-4.png differ diff -Nru gnome-music-41.1/data/style.css gnome-music-42.1/data/style.css --- gnome-music-41.1/data/style.css 1970-01-01 00:00:00.000000000 +0000 +++ gnome-music-42.1/data/style.css 2022-04-25 07:23:02.000000000 +0000 @@ -0,0 +1,128 @@ +/* AlbumCover */ +.albumcover-title-label { + color: @theme_fg_color; +} + +.albumcover-artist-label { + font-size: smaller; + color: @theme_fg_color; +} + +/* AlbumsView */ + +#albums gridview { + padding: 18px; +} + +#albums gridview > child { + margin: 9px; + padding: 6px; +} + +/* By default in Adwaita dark this is not transparent */ +.tile { + background-color: transparent; +} + +.playlist-icon { + padding: 10px; + border-radius: 50%; + background-color: alpha(@theme_fg_color, 0.1); +} + +.disc-label { + color: alpha(@theme_fg_color, 0.8); + padding: 12px 0; +} + +/* PlayerToolbar */ + +.smooth-scale { + padding-top: 0px; + padding-bottom: 0px; +} + +/* We use background-image as a workaround on the StarImage widget to + enable transitions between the non-starred and starred icons. */ +.star { + background-image: -gtk-icontheme('non-starred-symbolic'); + color: alpha(@theme_fg_color, 0.3); + transition: 100ms linear; +} + +.star:hover { + color: alpha(@theme_fg_color, 0.6); +} + +.star:selected { + background-image: -gtk-icontheme('starred-symbolic'); + color: @theme_selected_bg_color; + transition: 100ms linear; +} + +.grey-image { + color: alpha(@theme_fg_color, 0.3); +} + +/* Used in AlbumWidget and ArtistAlbumsWidget */ +.playing-song-label { + font-weight: bold; +} + +/* TwoLineTip */ +.tooltip-title { + font-weight: bold; +} + +.playlistdialog-row:selected { + color: @theme_fg_color; + background-color: @theme_insensitive_bg_color; +} + +.playlistdialog-row:selected label { + color: @theme_text_color; +} + +/* SearchView */ +.search-header { + font-weight: bold; +} + +/* dnd icon for SongWidget */ +.drag-handle { + color: alpha(@theme_fg_color, 0.4); +} + +.drag-handle:backdrop { + color: alpha(@theme_unfocused_fg_color, 0.4); +} + +/* Last.fm dialog */ +.lastfm-status-label { + font-weight: bold; +} + +/* SongsView */ +/* boxed-list style does not work for +GtkListView at the moment */ +.songs-list { + border-left: 1px solid @borders; + border-right: 1px solid @borders; + border-top: 1px solid @borders; +} + +.songs-list:first-child { + border-top-left-radius: 12px; + border-top-right-radius: 12px; +} + +.songs-list:last-child { + border-bottom-left-radius: 12px; + border-bottom-right-radius: 12px; +} + +/* SongWidget and SongsView rows*/ +.songwidget, +.songs-list row { + padding: 12px; +} diff -Nru gnome-music-41.1/data/ui/AboutDialog.ui.in gnome-music-42.1/data/ui/AboutDialog.ui.in --- gnome-music-41.1/data/ui/AboutDialog.ui.in 2022-04-25 09:18:06.000000000 +0000 +++ gnome-music-42.1/data/ui/AboutDialog.ui.in 2022-04-25 07:23:02.000000000 +0000 @@ -2,7 +2,7 @@