+ It's been a while, hasn't it? I'm back, but please allow everyone some time to work through the issues and pull requests :)
+
+
+
added an option for gapless playback (thanks @supremesnickers!)
+
fixed theme management (thanks @ctsk!)
+
fixed the behaviour of the "previous" button for consistency with other media players (thanks @SomewhereOutInSpace!)
+
the user will now be prompted to unlock the keyring if needed (thanks @rainDiX!)
+
added playlist creation and edition
+
more bug fixes
+
+
+ Thanks to all the contributors who are somehow still around :) If you feel like you've been unjustly forgotten from the AUTHORS or TRANSLATORS file, feel free to open a PR.
+
+
+
diff --git a/data/dev.alextren.Spot.desktop b/data/dev.alextren.Spot.desktop
index 6f1feed1..e06a59df 100644
--- a/data/dev.alextren.Spot.desktop
+++ b/data/dev.alextren.Spot.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Version=1.0
+Version=1.5
Name=Spot
Exec=spot %u
GenericName=Music Player
@@ -10,3 +10,4 @@ Categories=GTK;GNOME;Music;AudioVideo;
MimeType=x-scheme-handler/spotify;
StartupNotify=true
X-Purism-FormFactor=Workstation;Mobile;
+SingleMainWindow=true
diff --git a/data/dev.alextren.Spot.gschema.xml b/data/dev.alextren.Spot.gschema.xml
index 6a11f4f7..f3fefc0f 100644
--- a/data/dev.alextren.Spot.gschema.xml
+++ b/data/dev.alextren.Spot.gschema.xml
@@ -9,10 +9,15 @@
+
+
+
+
+
-
- true
- Prefer dark theme
+
+ 'system'
+ The theme preference1080
@@ -34,6 +39,10 @@
'pulseaudio'Audio backend
+
+ true
+ A flag to enable gap-less playback
+ 'default'Alsa device (if audio backend is 'alsa')
diff --git a/meson.build b/meson.build
index 0b45e13c..61774bfa 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
project(
'spot',
- version: '0.3.3',
+ version: '0.4.0',
meson_version: '>= 0.50.0',
default_options: ['warning_level=2', 'buildtype=release'],
)
diff --git a/po/LINGUAS b/po/LINGUAS
index 96adb403..c687aff0 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1 @@
-en ru fr nl de ca cs pl es pt tr id pt-br fi eu ia nb sl ja ar it uk bn
+en ru fr nl de ca cs pl es pt tr id pt-br fi eu ia nb sl ja ar it uk bn bg et
diff --git a/po/POTFILES b/po/POTFILES
index 7842c63a..d1ce8002 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -4,11 +4,13 @@ src/app/components/labels.rs
src/app/components/login/login_model.rs
src/app/components/mod.rs
src/app/components/navigation/factory.rs
-src/app/components/navigation/home.rs
+src/app/components/notification/mod.rs
src/app/components/now_playing/now_playing_model.rs
src/app/components/playback/playback_controls.rs
src/app/components/playback/playback_info.rs
src/app/components/selection/component.rs
+src/app/components/sidebar/sidebar_item.rs
+src/app/components/sidebar/sidebar.rs
src/app/components/user_menu/user_menu.rs
src/app/state/login_state.rs
src/main.rs
@@ -18,19 +20,23 @@ src/window.ui.in
src/app/components/saved_playlists/saved_playlists.ui
src/app/components/artist_details/artist_details.ui
src/app/components/saved_tracks/saved_tracks.ui
-src/app/components/sidebar_listbox/sidebar_icon_widget.ui
src/app/components/search/search.ui
src/app/components/settings/settings.ui
src/app/components/artist/artist.ui
src/app/components/user_details/user_details.ui
src/app/components/selection/selection_toolbar.ui
+src/app/components/scrolling_header/scrolling_header.ui
src/app/components/details/album_header.ui
src/app/components/details/release_details.ui
src/app/components/details/details.ui
src/app/components/now_playing/now_playing.ui
src/app/components/login/login.ui
+src/app/components/playlist_details/playlist_headerbar.ui
+src/app/components/playlist_details/playlist_header.ui
src/app/components/playlist_details/playlist_details.ui
src/app/components/headerbar/headerbar.ui
+src/app/components/sidebar/create_playlist.ui
+src/app/components/sidebar/sidebar_row.ui
src/app/components/album/album.ui
src/app/components/playlist/song.ui
src/app/components/playback/playback_widget.ui
diff --git a/po/ar.po b/po/ar.po
index 8ebf7ccd..19dc33ca 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "لايمكن حفظ كلمة المرور. تحقق من أن ال Session Keyring مفتوح."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "حدث خطأ. تحقق من الlog لمزيد التفاصيل!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "مكتبة"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "قائمة أغاني"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "يشتغل الأن"
@@ -84,7 +84,7 @@ msgstr "غادر"
msgid "Log out"
msgstr "تسجيل الخروج"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "إعادة الاتصال"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "قم بتسجيل الدخول إلى Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "أسم المستخدم"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "كلمة السر"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "فشل عملىة التحقق!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "تسجيل دخول"
@@ -133,16 +133,11 @@ msgstr "ألبومات"
msgid "Artists"
msgstr "الفنانين"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "أغاني محفوظة"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Caps Lock مفعل"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr "أوقف"
@@ -218,6 +213,7 @@ msgid "Add to playlist..."
msgstr "أضف إلى قائمة التشغيل..."
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr "ألغاء"
@@ -229,7 +225,6 @@ msgstr "اختر الكل"
#. translators: This is part of a contextual menu attached to a single track; the full text is "More from ".
#: src/app/components/labels.rs:39
-#, fuzzy
msgid "More from {}"
msgstr "{} المزيد من"
@@ -262,12 +257,12 @@ msgstr "حقوق النشر"
msgid "{} by {}"
msgstr "{}بواسطة {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
msgstr ""
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
msgstr ""
@@ -280,7 +275,7 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
msgstr ""
@@ -322,35 +317,35 @@ msgid "Very high"
msgstr ""
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
msgstr ""
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
msgstr ""
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
msgstr ""
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr ""
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
msgstr ""
@@ -358,3 +353,41 @@ msgstr ""
msgid "Save to library"
msgstr ""
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr ""
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr ""
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr ""
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr ""
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr ""
+
diff --git a/po/bg.po b/po/bg.po
new file mode 100644
index 00000000..182f7668
--- /dev/null
+++ b/po/bg.po
@@ -0,0 +1,389 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: Spot\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
+#: src/app/components/labels.rs:5
+msgid "View album"
+msgstr ""
+
+#. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
+#: src/app/components/labels.rs:8
+msgid "Copy link"
+msgstr ""
+
+#. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:39
+msgid "Add to queue"
+msgstr ""
+
+#. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
+#: src/app/components/labels.rs:14
+msgid "Remove from queue"
+msgstr ""
+
+#. translators: This is part of a larger text that says "Add to ". This text should be as short as possible.
+#: src/app/components/labels.rs:21
+msgid "Add to {}"
+msgstr ""
+
+#. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
+#: src/app/components/login/login_model.rs:56
+msgid "Could not save password. Make sure the session keyring is unlocked."
+msgstr ""
+
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
+msgid "An error occured. Check logs for details!"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
+msgid "Library"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
+msgid "Playlists"
+msgstr ""
+
+#. This is the visible name for the play queue. It appears in the sidebar as well.
+#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
+msgid "Now playing"
+msgstr ""
+
+#. translators: Short text displayed instead of a song title when nothing plays
+#. Short text displayed instead of a song title when nothing plays
+#: src/app/components/playback/playback_info.rs:58
+#: src/app/components/playback/playback_info.ui:32
+msgid "No song playing"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:67
+msgid "About"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:69
+msgid "Quit"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:74
+msgid "Log out"
+msgstr ""
+
+#: src/app/state/login_state.rs:112
+msgid "Connection restored"
+msgstr ""
+
+#. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
+#: src/app/components/artist_details/artist_details.ui:26
+msgid "Top tracks"
+msgstr ""
+
+#. Title of the sections that contains all releases from an artist (both singles and albums).
+#: src/app/components/artist_details/artist_details.ui:53
+msgid "Releases"
+msgstr ""
+
+#. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
+#: src/app/components/login/login.ui:45
+msgid "Login to Spotify Premium"
+msgstr ""
+
+#. Placeholder for the username field
+#: src/app/components/login/login.ui:72
+msgid "Username"
+msgstr ""
+
+#. Placeholder for the password field
+#: src/app/components/login/login.ui:89
+msgid "Password"
+msgstr ""
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:114
+msgid "Authentication failed!"
+msgstr ""
+
+#. Log in button label
+#: src/app/components/login/login.ui:129
+msgid "Log in"
+msgstr ""
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:72
+msgid "Albums"
+msgstr ""
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:105
+msgid "Artists"
+msgstr ""
+
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
+msgid "Saved tracks"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr ""
+
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr ""
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr ""
+
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr ""
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr ""
+
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:116
+msgid "Search Spotify."
+msgstr ""
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:117
+msgid "Type to search."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:69
+msgid "Remove"
+msgstr ""
+
+#. playlist2-symbolic
+#: src/app/components/selection/selection_toolbar.ui:56
+msgid "Add to playlist..."
+msgstr ""
+
+#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
+#: src/app/components/headerbar/headerbar.ui:47
+msgid "Cancel"
+msgstr ""
+
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:58
+msgid "Select all"
+msgstr ""
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from ".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr ""
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr ""
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr ""
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr ""
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr ""
+
+#: src/app/components/details/release_details.ui:68
+msgid "Copyright"
+msgstr ""
+
+#. translators: This is part of a larger label that reads " by "
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar.rs:48
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/sidebar/sidebar_item.rs:81
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:80
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:70
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:73
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:77
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:78
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:89
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:92
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:93
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr ""
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr ""
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr ""
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr ""
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr ""
+
diff --git a/po/bn.po b/po/bn.po
index d0632f42..899b8233 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -46,28 +46,28 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "পাসওয়ার্ড সেভ করা যায়নি। সেশন কীরিং আনলক করা আছে কিনা নিশ্চিত করুন।"
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
#, fuzzy
msgid "An error occured. Check logs for details!"
msgstr "একটি ত্রুটি ঘটেছে। বিস্তারিত জানতে লগ চেক করুন!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
#, fuzzy
msgid "Library"
msgstr "লাইব্রেরী"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
#, fuzzy
msgid "Playlists"
msgstr "প্লেলিস্ট"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
#, fuzzy
msgid "Now playing"
msgstr "এখন প্লে হচ্ছে"
@@ -98,7 +98,7 @@ msgstr "প্রস্থান করুন"
msgid "Log out"
msgstr "লগ আউট"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
#, fuzzy
msgid "Connection restored"
msgstr "সংযোগ পুনরুদ্ধার করা হয়েছে"
@@ -122,25 +122,25 @@ msgid "Login to Spotify Premium"
msgstr "স্পটিফাই প্রিমিয়ামে লগইন করুন"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
#, fuzzy
msgid "Username"
msgstr "ইউজারনেম"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
#, fuzzy
msgid "Password"
msgstr "পাসওয়ার্ড"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
#, fuzzy
msgid "Authentication failed!"
msgstr "অথেন্টিকেশন ব্যর্থ হয়েছে!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
#, fuzzy
msgid "Log in"
msgstr "লগ ইন"
@@ -157,18 +157,12 @@ msgstr "অ্যালবাম"
msgid "Artists"
msgstr "আর্টিস্ট"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
#, fuzzy
msgid "Saved tracks"
msgstr "সেভ করা ট্র্যাকগুলি"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-#, fuzzy
-msgid "Caps Lock is enabled!"
-msgstr "ক্যাপস লক সক্রিয় আছে!"
-
#: src/app/components/playback/playback_controls.rs:64
#, fuzzy
msgid "Pause"
@@ -255,6 +249,7 @@ msgid "Add to playlist..."
msgstr "প্লেলিস্টে যোগ করুন..."
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
#, fuzzy
msgid "Cancel"
@@ -307,12 +302,12 @@ msgstr "কপিরাইট"
msgid "{} by {}"
msgstr "{} বাই {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
msgstr ""
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
msgstr ""
@@ -325,7 +320,7 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
msgstr ""
@@ -367,35 +362,35 @@ msgid "Very high"
msgstr ""
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
msgstr ""
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
msgstr ""
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
msgstr ""
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr ""
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
msgstr ""
@@ -403,3 +398,41 @@ msgstr ""
msgid "Save to library"
msgstr ""
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr ""
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr ""
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr ""
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr ""
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr ""
+
diff --git a/po/ca.po b/po/ca.po
index b04a788b..65666603 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "No s'ha pogut desar la sessió. Assegura't que l'anell de claus de la sessió està desbloquejat."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "Ha ocorregut un error. Comprova els registres per més detalls!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Biblioteca"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Llistes de reproducció"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "S'està reproduïnt"
@@ -84,7 +84,7 @@ msgstr "Surt"
msgid "Log out"
msgstr "Tanca la sessió"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Connexió restablerta"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Inicia la sessió a Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Nom d'usuari"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Contrasenya"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "L'autenticació ha fallat!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Inicia sessió"
@@ -133,16 +133,11 @@ msgstr "Àlbums"
msgid "Artists"
msgstr "Artistes"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "Pistes desades"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Bloq Maj està habilitat!"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr "Pausa"
@@ -214,6 +209,7 @@ msgid "Add to playlist..."
msgstr "Afegeix a la llista..."
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr "Cancel·la"
@@ -235,13 +231,11 @@ msgstr "Etiqueta"
#. This refers to a release date
#: src/app/components/details/release_details.ui:48
-#, fuzzy
msgid "Released"
msgstr "Llançaments"
#. This refers to a number of tracks
#: src/app/components/details/release_details.ui:58
-#, fuzzy
msgid "Tracks"
msgstr "Millors pistes"
@@ -259,99 +253,139 @@ msgstr "Copyright"
msgid "{} by {}"
msgstr "{} per {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
-msgstr ""
+msgstr "Llista sense nom"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
-msgstr ""
+msgstr "Totes les llistes"
#: src/app/components/selection/component.rs:66
msgid "Tracks saved!"
-msgstr ""
+msgstr "Cançons desades!"
#. translators: This is a menu entry.
#: src/app/components/user_menu/user_menu.rs:65
msgid "Preferences"
-msgstr ""
+msgstr "Preferències"
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
-msgstr ""
+msgstr "No s'ha pogut obrir l'enllaç!"
#. Header for a group of preference items regarding audio
#: src/app/components/settings/settings.ui:13
msgid "Audio"
-msgstr ""
+msgstr "Àudio"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:16
msgid "Audio Backend"
-msgstr ""
+msgstr "Sistema d'àudio"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:29
msgid "ALSA Device"
-msgstr ""
+msgstr "Dispositiu ALSA"
#. Description for the item (ALSA Device) in preferences
#: src/app/components/settings/settings.ui:30
msgid "Applied only if audio backend is ALSA"
-msgstr ""
+msgstr "Usat només si el sistema d'àudio és l'ALSA"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:40
msgid "Audio Quality"
-msgstr ""
+msgstr "Qualitat de l'àudio"
#: src/app/components/settings/settings.ui:44
msgid "Normal"
-msgstr ""
+msgstr "Normal"
+#. Qualitat d'àudio -> femení, la qualitat
#: src/app/components/settings/settings.ui:45
msgid "High"
-msgstr ""
+msgstr "Alta"
+#. El mateix que amb "High". Cal usar el femení
#: src/app/components/settings/settings.ui:46
msgid "Very high"
-msgstr ""
+msgstr "Molt alta"
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
-msgstr ""
+msgstr "Aparença"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
-msgstr ""
+msgstr "Tema"
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
-msgstr ""
+msgstr "Clar"
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
-msgstr ""
+msgstr "Fosc"
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
-msgstr ""
+msgstr "Xarxa"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
-msgstr ""
+msgstr "Port del punt d'accés"
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
-msgstr ""
+msgstr "El port usat per les connexions al punt d'accés de l'Spotify. Establiu-ho a 0 si qualsevol port és correcte."
#: src/app/components/selection/selection_toolbar.ui:90
msgid "Save to library"
+msgstr "Desa-ho a la llibreria"
+
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr ""
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr ""
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr ""
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr ""
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 52e70fe0..a5d48d96 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "Heslo nelze uložit. Zkontrolujte, že je klíčenka (session keyring) odemčená."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "Došlo k chybě. Podrobnosti najdete v protokolu."
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Knihovna"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Playlisty"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "Právě hraje"
@@ -84,7 +84,7 @@ msgstr "Konec"
msgid "Log out"
msgstr "Odhlásit se"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Připojení obnoveno"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Přihlásit se ke Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Uživatelské jméno"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Heslo"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "Chyba autentizace!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Přihlásit se"
@@ -136,16 +136,11 @@ msgstr "Umělci"
#. Where is this text displayed?
#. I see it is supposed to be in `src/app/components/navigation/home.rs:47`, but that does not seem to be the case: https://github.com/xou816/spot/blob/1b96cd07129f27c7f3f3a2e66299c44a52e489d4/src/app/components/navigation/home.rs
#. Maybe it is something that has not been commited yet (2021-10-02T10:42:52+02:00), but @xou816 has it locally and has generated pot / po files from it in https://github.com/xou816/spot/commit/86414c03d207cdf4e2c1cbddd47c7ca5629d1303
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "Uložené skladby"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Máte zapnutý Caps Lock!"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr "Pozastavit"
@@ -218,6 +213,7 @@ msgid "Add to playlist..."
msgstr "Přidat do playlistu..."
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr "Zrušit"
@@ -261,12 +257,12 @@ msgstr "Copyright"
msgid "{} by {}"
msgstr "{} od {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
msgstr "Playlist bez názvu"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
msgstr "Všechny playlisty"
@@ -279,7 +275,7 @@ msgstr "Skladby uloženy!"
msgid "Preferences"
msgstr "Nastavení"
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
msgstr "Nepodařilo se otevřít odkaz!"
@@ -321,35 +317,35 @@ msgid "Very high"
msgstr "Velmi vysoká"
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
msgstr "Vzhled"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
msgstr "Téma"
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
msgstr "Světlé"
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
msgstr "Tmavé"
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
msgstr "Síť"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr "Port Access Pointu"
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
msgstr "Port používaný pro připojení ke Spotify Access Point. Nastavte na 0 pokud lze použít libovolný port."
@@ -357,3 +353,41 @@ msgstr "Port používaný pro připojení ke Spotify Access Point. Nastavte na 0
msgid "Save to library"
msgstr "Uložit do knihovny"
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr "Playlist byl vytvořen."
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr "Zobrazit"
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr "Přidat playlist"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr "Přehrávání bez mezer"
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr "Systém"
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr "Hotovo"
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr "Název"
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr "Vytvořit"
+
diff --git a/po/de.po b/po/de.po
index 86f0cd5a..f1df6bf7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -40,34 +40,34 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "Das Passwort konnte nicht gespeichert werden. Stellen Sie sicher, dass der Sitzungs-Schlüsselbund entsperrt ist."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "Es ist ein Fehler aufgetreten. Überprüfen Sie die Protokolle für Details!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Bibliothek"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Playlists"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
-msgstr "Es läuft"
+msgstr "Wiedergabe"
#. translators: Short text displayed instead of a song title when nothing plays
#. Short text displayed instead of a song title when nothing plays
#: src/app/components/playback/playback_info.rs:58
#: src/app/components/playback/playback_info.ui:32
msgid "No song playing"
-msgstr "Es wird kein Titel gespielt"
+msgstr "Keine Wiedergabe"
#. translators: This is a menu entry.
#: src/app/components/user_menu/user_menu.rs:67
@@ -84,7 +84,7 @@ msgstr "Beenden"
msgid "Log out"
msgstr "Abmelden"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Verbindung wiederhergestellt"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Bei Spotify Premium anmelden"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Benutzername"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Passwort"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "Anmeldung fehlgeschlagen!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Anmelden"
@@ -133,16 +133,11 @@ msgstr "Alben"
msgid "Artists"
msgstr "Künstler"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "Gespeicherte Titel"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Feststelltaste ist aktiviert!"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr "Pause"
@@ -214,6 +209,7 @@ msgid "Add to playlist..."
msgstr "Zur Playlist hinzufügen..."
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr "Abbrechen"
@@ -257,14 +253,14 @@ msgstr "Copyright"
msgid "{} by {}"
msgstr "{} von {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
msgstr "Unbenannte Playlist"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
-msgstr "Alle Playlist"
+msgstr "Alle Playlists"
#: src/app/components/selection/component.rs:66
msgid "Tracks saved!"
@@ -275,9 +271,9 @@ msgstr "Titel gespeichert!"
msgid "Preferences"
msgstr "Einstellungen"
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
-msgstr "Öffnen des Links fehlgschlagen!"
+msgstr "Öffnen des Links fehlgeschlagen!"
#. Header for a group of preference items regarding audio
#: src/app/components/settings/settings.ui:13
@@ -302,7 +298,7 @@ msgstr "Wird nur angewendet, wenn das Audio-Backend ALSA ist"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:40
msgid "Audio Quality"
-msgstr "Audio Qualität"
+msgstr "Audioqualität"
#: src/app/components/settings/settings.ui:44
msgid "Normal"
@@ -317,39 +313,77 @@ msgid "Very high"
msgstr "Sehr hoch"
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
msgstr "Aussehen"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
msgstr "Thema"
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
msgstr "Hell"
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
msgstr "Dunkel"
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
msgstr "Netzwerk"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr "Access Point Port"
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
msgstr "Port, der für Verbindungen mit dem Spotify Access Point verwendet wird. Setze den Wert auf 0 für einen beliebigen Port."
#: src/app/components/selection/selection_toolbar.ui:90
msgid "Save to library"
-msgstr "Speichere in Bibliothek"
+msgstr "In Bibliothek speichern"
+
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr "Neue Playlist erstellt."
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr "Anzeigen"
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr "Neue Playlist"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr "Lückenlose Wiedergabe"
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr "System"
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr "Fertig"
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr "Name"
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr "Erstellen"
diff --git a/po/en.po b/po/en.po
index 5fe7d6c2..87549455 100644
--- a/po/en.po
+++ b/po/en.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "Could not save password. Make sure the session keyring is unlocked."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "An error occured. Check logs for details!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Library"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Playlists"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "Now playing"
@@ -84,7 +84,7 @@ msgstr "Quit"
msgid "Log out"
msgstr "Log out"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Connection restored"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Login to Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Username"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Password"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "Authentication failed!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Log in"
@@ -133,16 +133,11 @@ msgstr "Albums"
msgid "Artists"
msgstr "Artists"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "Saved Tracks"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Caps Lock is enabled!"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr "Pause"
@@ -214,6 +209,7 @@ msgid "Add to playlist..."
msgstr "Add to playlist..."
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr "Cancel"
@@ -257,12 +253,12 @@ msgstr "Copyright"
msgid "{} by {}"
msgstr "{} by {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
-msgstr ""
+msgstr "Unnamed playlist"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
msgstr ""
@@ -275,7 +271,7 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
msgstr ""
@@ -317,35 +313,35 @@ msgid "Very high"
msgstr ""
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
msgstr ""
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
msgstr ""
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
msgstr ""
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr ""
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
msgstr ""
@@ -353,3 +349,41 @@ msgstr ""
msgid "Save to library"
msgstr ""
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr ""
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr ""
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr ""
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr ""
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr ""
+
diff --git a/po/es.po b/po/es.po
index d029224c..a47ce127 100644
--- a/po/es.po
+++ b/po/es.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "No se pudo guardar la contraseña. Asegúrate de que el anillo de claves esta desbloqueado."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "Ha ocurrido un error. ¡Revisa los logs para más detalles!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Biblioteca"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Lista de reproducción"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "Reproduciendo ahora"
@@ -84,7 +84,7 @@ msgstr "Salir"
msgid "Log out"
msgstr "Cerrar sesión"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Conexión restaurada"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Iniciar sesión en Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Usuario"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Contraseña"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "¡Autenticación fallida!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Iniciar sesión"
@@ -133,16 +133,11 @@ msgstr "Álbumes"
msgid "Artists"
msgstr "Artistas"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "Pistas guardadas"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "¡El bloqueo de mayúsculas está activado!"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr "Pausa"
@@ -214,6 +209,7 @@ msgid "Add to playlist..."
msgstr "Añadir a la lista de reproducción..."
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr "Cancelar"
@@ -257,12 +253,12 @@ msgstr "Copyright"
msgid "{} by {}"
msgstr "{} de {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
msgstr "Lista de reproducción sin nombre"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
msgstr "Todas las listas de reproducción"
@@ -275,7 +271,7 @@ msgstr "¡Pistas guardadas!"
msgid "Preferences"
msgstr "Preferencias"
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
msgstr "¡No se ha podido abrir el enlace!"
@@ -317,35 +313,35 @@ msgid "Very high"
msgstr "Muy alta"
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
msgstr "Apariencia"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
msgstr "Tema"
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
msgstr "Claro"
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
msgstr "Oscuro"
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
msgstr "Red"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr "Puerto del punto de acceso"
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
msgstr "Puerto utilizado para las conexiones con el punto de acceso de Spotify. Poner a 0 si cualquier puerto está bien."
@@ -353,3 +349,41 @@ msgstr "Puerto utilizado para las conexiones con el punto de acceso de Spotify.
msgid "Save to library"
msgstr "Guardar en la biblioteca"
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr ""
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr ""
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr ""
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr ""
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr ""
+
diff --git a/po/et.po b/po/et.po
new file mode 100644
index 00000000..a8d92d46
--- /dev/null
+++ b/po/et.po
@@ -0,0 +1,389 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: Spot\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
+#: src/app/components/labels.rs:5
+msgid "View album"
+msgstr "Vaata albumit"
+
+#. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
+#: src/app/components/labels.rs:8
+msgid "Copy link"
+msgstr "Kopeeri link"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:39
+msgid "Add to queue"
+msgstr "Lisa järjekorda"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
+#: src/app/components/labels.rs:14
+msgid "Remove from queue"
+msgstr "Eemalda järjekorrast"
+
+#. translators: This is part of a larger text that says "Add to ". This text should be as short as possible.
+#: src/app/components/labels.rs:21
+msgid "Add to {}"
+msgstr "Lisa {}"
+
+#. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
+#: src/app/components/login/login_model.rs:56
+msgid "Could not save password. Make sure the session keyring is unlocked."
+msgstr "Salasõna salvestamine ebaõnnestus. Kindel, et sessiooni võtmering on lukust lahti?"
+
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
+msgid "An error occured. Check logs for details!"
+msgstr "Tekkis viga. Rohkem infot logides."
+
+#. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
+msgid "Library"
+msgstr "Teek"
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
+msgid "Playlists"
+msgstr "Esitusloendid"
+
+#. This is the visible name for the play queue. It appears in the sidebar as well.
+#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
+msgid "Now playing"
+msgstr "Praegu mängib"
+
+#. translators: Short text displayed instead of a song title when nothing plays
+#. Short text displayed instead of a song title when nothing plays
+#: src/app/components/playback/playback_info.rs:58
+#: src/app/components/playback/playback_info.ui:32
+msgid "No song playing"
+msgstr "Ükski laul ei mängi"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:67
+msgid "About"
+msgstr "Teave"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:69
+msgid "Quit"
+msgstr "Sulge"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:74
+msgid "Log out"
+msgstr "Logi välja"
+
+#: src/app/state/login_state.rs:112
+msgid "Connection restored"
+msgstr "Ühendus taastatud"
+
+#. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
+#: src/app/components/artist_details/artist_details.ui:26
+msgid "Top tracks"
+msgstr "Populaarsemad lood"
+
+#. Title of the sections that contains all releases from an artist (both singles and albums).
+#: src/app/components/artist_details/artist_details.ui:53
+msgid "Releases"
+msgstr "Diskograafia"
+
+#. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
+#: src/app/components/login/login.ui:45
+msgid "Login to Spotify Premium"
+msgstr "Logi sisse Spotify Premiumisse"
+
+#. Placeholder for the username field
+#: src/app/components/login/login.ui:72
+msgid "Username"
+msgstr "Kasutajanimi"
+
+#. Placeholder for the password field
+#: src/app/components/login/login.ui:89
+msgid "Password"
+msgstr "Salasõna"
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:114
+msgid "Authentication failed!"
+msgstr "Autentimine ebaõnnestus!"
+
+#. Log in button label
+#: src/app/components/login/login.ui:129
+msgid "Log in"
+msgstr "Logi sisse"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:72
+msgid "Albums"
+msgstr "Albumid"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:105
+msgid "Artists"
+msgstr "Esitajad"
+
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
+msgid "Saved tracks"
+msgstr "Salvestatud lood"
+
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "Peata"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "Esita"
+
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "Juhuesitus"
+
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "Eelmine"
+
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "Järgmine"
+
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "Korda"
+
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr "Sul pole ühtegi salvestatud esitusloendit."
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr "Sinu esitusloendid näidatakse siin."
+
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "Sul pole ühtegi salvestatud albumit."
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "Sinu teeki näidatakse siin."
+
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} lugu valitud"
+msgstr[1] "{} lugu valitud"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:116
+msgid "Search Spotify."
+msgstr "Otsi Spotify'st."
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:117
+msgid "Type to search."
+msgstr "Tipi, et otsida."
+
+#: src/app/components/selection/selection_toolbar.ui:69
+msgid "Remove"
+msgstr "Eemalda"
+
+#. playlist2-symbolic
+#: src/app/components/selection/selection_toolbar.ui:56
+msgid "Add to playlist..."
+msgstr "Lisa esitusloendisse..."
+
+#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
+#: src/app/components/headerbar/headerbar.ui:47
+msgid "Cancel"
+msgstr "Loobu"
+
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:58
+msgid "Select all"
+msgstr "Vali kõik"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from ".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Rohkem esitajast {}"
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Väljaandja"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Välja antud"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Lood"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Pikkus"
+
+#: src/app/components/details/release_details.ui:68
+msgid "Copyright"
+msgstr "Autoriõigused"
+
+#. translators: This is part of a larger label that reads " by "
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr "{} - {}"
+
+#: src/app/components/sidebar/sidebar.rs:48
+msgid "Unnamed playlist"
+msgstr "Nimetamata esitusloend"
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/sidebar/sidebar_item.rs:81
+msgid "All Playlists"
+msgstr "Kõik esitusloendid"
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr "Lugu salvestatud!"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr "Eelistused"
+
+#: src/main.rs:80
+msgid "Failed to open link!"
+msgstr "Lingi avamine ebaõnnestus!"
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr "Heli"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr "Heli sisend"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr "ALSA heliseade"
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr "Kehtib ainult, kui heli sisend on ALSA"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr "Heli kvaliteet"
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr "Keskmine"
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr "Kõrge"
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr "Väga kõrge"
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:70
+msgid "Appearance"
+msgstr "Välimus"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:73
+msgid "Theme"
+msgstr "Teema"
+
+#: src/app/components/settings/settings.ui:77
+msgid "Light"
+msgstr "Hele teema"
+
+#: src/app/components/settings/settings.ui:78
+msgid "Dark"
+msgstr "Tume teema"
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:89
+msgid "Network"
+msgstr "Võrk"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:92
+msgid "Access Point Port"
+msgstr "Sissepääsu port"
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:93
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr "Port Spotify ühendamiseks. Säti 0, et lubada iga port."
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr "Salvesta teeki"
+
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr ""
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr ""
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr ""
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr ""
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr ""
+
diff --git a/po/eu.po b/po/eu.po
index 0e081bb1..5596c2c9 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "Ezin izan da pasahitza gorde. Ziurtatu saioko giltzatakoa desblokeatuta dagoela."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "Errore bat gertatu da. Egiaztatu xehetasunak erregistroetan!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Biblioteka"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Erreprodukzio-zerrendak"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "Orain erreproduzitzen"
@@ -84,7 +84,7 @@ msgstr "Utzi"
msgid "Log out"
msgstr "Saioa itxi"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Konexioa leheneratu da"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Saioa hasi Spotify Premiumen"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Erabiltzailearen izena"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Pasahitza"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "Autentifikazioak huts egin du!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Hasi saioa"
@@ -133,16 +133,11 @@ msgstr "Albumak"
msgid "Artists"
msgstr "Artistak"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "Gordetako pistak"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Letra larrien blokeoa aktibatuta dago!"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr "Gelditu"
@@ -214,6 +209,7 @@ msgid "Add to playlist..."
msgstr "Erreprodukzio-zerrendara gehitu..."
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr "Ezeztatu"
@@ -257,12 +253,12 @@ msgstr "Egile-eskubideak"
msgid "{} by {}"
msgstr "{} {} -ek eginda"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
msgstr ""
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
msgstr ""
@@ -275,7 +271,7 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
msgstr ""
@@ -317,35 +313,35 @@ msgid "Very high"
msgstr ""
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
msgstr ""
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
msgstr ""
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
msgstr ""
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr ""
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
msgstr ""
@@ -353,3 +349,41 @@ msgstr ""
msgid "Save to library"
msgstr ""
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr ""
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr ""
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr ""
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr ""
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr ""
+
diff --git a/po/fi.po b/po/fi.po
index 4cd28e5d..8213168a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -37,28 +37,28 @@ msgstr "Lisää kohteeseen {}"
#. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
#: src/app/components/login/login_model.rs:56
msgid "Could not save password. Make sure the session keyring is unlocked."
-msgstr "Salasanaa ei voitu tallentaa. Varmista että avainnippua ei ole lukittu."
+msgstr "Salasanaa ei voitu tallentaa. Varmista, että avainnippua ei ole lukittu."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
-msgstr "Tapahti virhe. Katso lisätiedot lokista!"
+msgstr "Tapahtui virhe. Katso lisätiedot lokista!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Kirjasto"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Soittolistat"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "Nyt toistetaan"
@@ -84,7 +84,7 @@ msgstr "Lopeta"
msgid "Log out"
msgstr "Kirjaudu ulos"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Yhteys palautunut"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Kirjaudu Spotify Premiumiin"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Käyttäjätunnus"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Salasana"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "Tunnistautuminen epäonnistui!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Kirjaudu sisään"
@@ -133,16 +133,11 @@ msgstr "Albumit"
msgid "Artists"
msgstr "Esittäjät"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "Tallennetut kappaleet"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Caps Lock on päällä!"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr "Keskeytä"
@@ -214,6 +209,7 @@ msgid "Add to playlist..."
msgstr "Lisää soittolistaan..."
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr "Peru"
@@ -257,12 +253,12 @@ msgstr "Tekijänoikeus"
msgid "{} by {}"
msgstr "{} tehnyt {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
msgstr "Nimetön soittolista"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
msgstr "Kaikki soittolistat"
@@ -275,7 +271,7 @@ msgstr "Kappaleet tallennettu!"
msgid "Preferences"
msgstr "Asetukset"
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
msgstr "Linkin avaaminen epäonnistui!"
@@ -317,35 +313,35 @@ msgid "Very high"
msgstr "Hyvin korkea"
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
msgstr "Ulkoasu"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
msgstr "Teema"
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
msgstr "Vaalea"
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
msgstr "Tumma"
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
msgstr "Verkko"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr "Access Pointin portti"
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
msgstr "Spotifyn Access Pointiin tuleviin yhteyksiin käytettävä portti. Aseta arvoksi 0, jos mikä tahansa portti kelpaa."
@@ -353,3 +349,41 @@ msgstr "Spotifyn Access Pointiin tuleviin yhteyksiin käytettävä portti. Aseta
msgid "Save to library"
msgstr "Tallenna kirjastoon"
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr "Uusi soittolista luotu."
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr "Näytä"
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr "Uusi soittolista"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr "Keskeytyksetön toisto"
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr "Järjestelmä"
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr "Valmis"
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr "Nimi"
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr "Luo"
+
diff --git a/po/fr.po b/po/fr.po
index 79c00644..b38527d0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "Le mot de passe n'a pu être enregistré, assurez-vous que le Trousseau de session est déverouillé."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "Une erreur est survenue. Consultez les journaux de débogage pour plus d'information."
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Bibliothèque"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Listes de lecture"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "En cours de lecture"
@@ -84,7 +84,7 @@ msgstr "Quitter"
msgid "Log out"
msgstr "Déconnexion"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Connexion rétablie"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Connexion à Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Nom d'utilisateur"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Mot de passe"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "L'authentification a échoué !"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Connexion"
@@ -133,16 +133,11 @@ msgstr "Albums"
msgid "Artists"
msgstr "Artistes"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "Titres aimés"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Verr. Maj. est actif !"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr "Pause"
@@ -214,6 +209,7 @@ msgid "Add to playlist..."
msgstr "Ajouter à..."
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr "Annuler"
@@ -257,12 +253,12 @@ msgstr "Copyright"
msgid "{} by {}"
msgstr "{} de {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
msgstr "Liste de lecture sans titre"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
msgstr "Toutes les listes de lecture"
@@ -275,7 +271,7 @@ msgstr "Pistes enregistrées !"
msgid "Preferences"
msgstr "Préférences"
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
msgstr "Échec de l'ouverture du lien."
@@ -317,35 +313,35 @@ msgid "Very high"
msgstr "Très élevée"
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
msgstr "Apparence"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
msgstr "Thème"
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
msgstr "Clair"
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
msgstr "Sombre"
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
msgstr "Réseau"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr "Port du point d'accès"
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
msgstr "Port utilisé pour se connecter au point d'accès de Spotify. Laisser la valeur à 0 pour gérer ce paramètre automatiquement. "
@@ -353,3 +349,41 @@ msgstr "Port utilisé pour se connecter au point d'accès de Spotify. Laisser la
msgid "Save to library"
msgstr "Enregistrer dans la bibliothèque"
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr "Liste de lecture créée."
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr "Voir"
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr "Nouvelle liste de lecture"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr "Lecture continue"
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr "Valeur système"
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr "Terminé"
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr "Nom"
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr "Créer"
+
diff --git a/po/ia.po b/po/ia.po
index e0cbded5..178e36e7 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "Non poteva salvar le contrasigno. Assecura te qui le magazin de claves es disblocate."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "Ocurreva un error. Verifica le registros pro detalios!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Bibliotheca"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Listas de reproduction"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "Ora in reproduction"
@@ -84,7 +84,7 @@ msgstr "Quitar"
msgid "Log out"
msgstr "Clauder le session"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Connexion restabilite"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Initiar session in Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Nomine de usator"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Contrasigno"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "Falleva le authentication!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Initiar session"
@@ -133,16 +133,11 @@ msgstr "Albumes"
msgid "Artists"
msgstr "Artistas"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "Tracias salvate"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Serratura de majusculas es activate!"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr "Pausar"
@@ -214,6 +209,7 @@ msgid "Add to playlist..."
msgstr "Adder al lista de reproduction..."
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr "Cancellar"
@@ -257,27 +253,27 @@ msgstr "Copyright"
msgid "{} by {}"
msgstr "{} per {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
-msgstr ""
+msgstr "Lista de reproduction sin nomine"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
-msgstr ""
+msgstr "Tote le listas de reproduction"
#: src/app/components/selection/component.rs:66
msgid "Tracks saved!"
-msgstr ""
+msgstr "Tracias salvate!"
#. translators: This is a menu entry.
#: src/app/components/user_menu/user_menu.rs:65
msgid "Preferences"
-msgstr ""
+msgstr "Preferentias"
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
-msgstr ""
+msgstr "Falleva in aperir ligamine!"
#. Header for a group of preference items regarding audio
#: src/app/components/settings/settings.ui:13
@@ -317,35 +313,35 @@ msgid "Very high"
msgstr ""
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
-msgstr ""
+msgstr "Apparentia"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
-msgstr ""
+msgstr "Thema"
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
-msgstr ""
+msgstr "Clar"
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
-msgstr ""
+msgstr "Obscur"
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
-msgstr ""
+msgstr "Rete"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr ""
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
msgstr ""
@@ -353,3 +349,41 @@ msgstr ""
msgid "Save to library"
msgstr ""
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr ""
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr ""
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr ""
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr ""
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr ""
+
diff --git a/po/id.po b/po/id.po
index 51745116..eba1f435 100644
--- a/po/id.po
+++ b/po/id.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "Tak bisa menyimpan sandi. Pastikan bahwa kunci sesi tidak terkunci."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "Timbul galat. Periksa log untuk detailnya!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Pustaka"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Daftar putar"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "Sedang memutar"
@@ -84,7 +84,7 @@ msgstr "Keluar"
msgid "Log out"
msgstr "Log keluar"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Sambungan dipulihkan"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Masuk ke Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Nama Pengguna"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Kata Sandi"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "Autentikasi gagal!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Log masuk"
@@ -133,16 +133,11 @@ msgstr "Album"
msgid "Artists"
msgstr "Artis"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "Trek yang disimpan"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Caps Lock diaktifkan!"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr "Jeda"
@@ -213,6 +208,7 @@ msgid "Add to playlist..."
msgstr "Tambah ke daftar putar…"
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr "Batal"
@@ -256,99 +252,137 @@ msgstr "Hak Cipta"
msgid "{} by {}"
msgstr "{} oleh {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
-msgstr ""
+msgstr "Daftar putar tanpa nama"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
-msgstr ""
+msgstr "Semua Daftar Putar"
#: src/app/components/selection/component.rs:66
msgid "Tracks saved!"
-msgstr ""
+msgstr "Trek disimpan!"
#. translators: This is a menu entry.
#: src/app/components/user_menu/user_menu.rs:65
msgid "Preferences"
-msgstr ""
+msgstr "Preferensi"
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
-msgstr ""
+msgstr "Gagal membuka tautan!"
#. Header for a group of preference items regarding audio
#: src/app/components/settings/settings.ui:13
msgid "Audio"
-msgstr ""
+msgstr "Audio"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:16
msgid "Audio Backend"
-msgstr ""
+msgstr "Backend Audio"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:29
msgid "ALSA Device"
-msgstr ""
+msgstr "Perangkat ALSA"
#. Description for the item (ALSA Device) in preferences
#: src/app/components/settings/settings.ui:30
msgid "Applied only if audio backend is ALSA"
-msgstr ""
+msgstr "Diterapkan hanya jika backend audio adalah ALSA"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:40
msgid "Audio Quality"
-msgstr ""
+msgstr "Kualitas Audio"
#: src/app/components/settings/settings.ui:44
msgid "Normal"
-msgstr ""
+msgstr "Normal"
#: src/app/components/settings/settings.ui:45
msgid "High"
-msgstr ""
+msgstr "Tinggi"
#: src/app/components/settings/settings.ui:46
msgid "Very high"
-msgstr ""
+msgstr "Sangat tinggi"
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
-msgstr ""
+msgstr "Penampilan"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
-msgstr ""
+msgstr "Tema"
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
-msgstr ""
+msgstr "Terang"
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
-msgstr ""
+msgstr "Gelap"
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
-msgstr ""
+msgstr "Jaringan"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
-msgstr ""
+msgstr "Port Titik Akses"
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
-msgstr ""
+msgstr "Port yang digunakan untuk koneksi ke Titik Akses Spotify. Atur ke 0 jika ada port yang baik-baik saja."
#: src/app/components/selection/selection_toolbar.ui:90
msgid "Save to library"
-msgstr ""
+msgstr "Simpan ke pustaka"
+
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr "Daftar putar baru dibuat."
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr "Tilik"
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr "Daftar Putar Baru"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr "Pemutaran tanpa celah"
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr "Sistem"
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr "Selesai"
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr "Nama"
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr "Mencipta"
diff --git a/po/it.po b/po/it.po
index 0b4f3abe..7fa76261 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,20 +1,13 @@
msgid ""
msgstr ""
-"Project-Id-Version: Spot\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-19 19:46-0500\n"
-"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: POEditor.com\n"
+"Project-Id-Version: Spot\n"
+"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
-msgid "An error occured. Check logs for details!"
-msgstr "C'è stato un errore. Controlla i log per i dettagli!"
-
#. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
#: src/app/components/labels.rs:5
msgid "View album"
@@ -27,7 +20,7 @@ msgstr "Copia link"
#. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
#: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
msgid "Add to queue"
msgstr "Aggiungi alla coda di riproduzione"
@@ -41,61 +34,34 @@ msgstr "Rimuovi dalla coda di riproduzione"
msgid "Add to {}"
msgstr "Aggiungi a {}"
-#. translators: This shows up when in selection mode. This text should be as short as possible.
-#: src/app/components/labels.rs:30
-msgid "{} song selected"
-msgid_plural "{} songs selected"
-msgstr[0] "{} brano selezionato"
-msgstr[1] "{} brani selezionati"
-
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from ".
-#: src/app/components/labels.rs:39
-msgid "More from {}"
-msgstr "Di più da {}"
-
-#. translators: This is part of a larger label that reads " by "
-#: src/app/components/labels.rs:48
-msgid "{} by {}"
-msgstr "{} di {}"
-
#. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
#: src/app/components/login/login_model.rs:56
msgid "Could not save password. Make sure the session keyring is unlocked."
-msgstr ""
-"Impossibile salvare la password. Controlla che la session keyring sia "
-"sbloccata."
+msgstr "Impossibile salvare la password. Controlla che la session keyring sia sbloccata."
+
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
+msgid "An error occured. Check logs for details!"
+msgstr "C'è stato un errore. Controlla i log per i dettagli!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Raccolta"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Playlist"
-#. translators: This is a sidebar entry to browse to saved tracks.
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
-msgid "Saved tracks"
-msgstr "Tracce salvate"
-
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#. This is the visible name for the play queue. It appears in the sidebar as well.
+#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "In riproduzione"
-#: src/app/components/playback/playback_controls.rs:64
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/app/components/playback/playback_controls.rs:66
-msgid "Play"
-msgstr "Riproduci"
-
#. translators: Short text displayed instead of a song title when nothing plays
#. Short text displayed instead of a song title when nothing plays
#: src/app/components/playback/playback_info.rs:58
@@ -104,136 +70,81 @@ msgid "No song playing"
msgstr "Nessun brano in riproduzione"
#. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
msgid "About"
msgstr "Informazioni su"
#. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
msgid "Quit"
msgstr "Esci"
#. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
msgid "Log out"
msgstr "Log out"
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Connessione ripristinata"
-#. A title that is shown when the user has not saved any playlists.
-#: src/app/components/saved_playlists/saved_playlists.ui:26
-msgid "You have no saved playlists."
-msgstr "Non hai playlist salvate."
-
-#. A description of what happens when the user has saved playlists.
-#: src/app/components/saved_playlists/saved_playlists.ui:27
-msgid "Your playlists will be shown here."
-msgstr "Le tue playlist verranno mostrate qui."
-
#. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
#: src/app/components/artist_details/artist_details.ui:26
msgid "Top tracks"
msgstr "Brani più popolari"
#. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
msgid "Releases"
msgstr "Releases"
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
-msgid "Albums"
-msgstr "Album"
-
-#. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
-msgid "Artists"
-msgstr "Artisti"
-
-#. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
-msgid "Search Spotify."
-msgstr "Cerca Spotify."
-
-#. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
-msgid "Type to search."
-msgstr "Digita per cercare."
-
-#. playlist2-symbolic
-#: src/app/components/selection/selection_toolbar.ui:47
-msgid "Add to playlist..."
-msgstr "Aggiungi alla playlist..."
-
-#: src/app/components/selection/selection_toolbar.ui:58
-msgid "Remove"
-msgstr "Rimuovi"
-
-#. This refers to a music label
-#: src/app/components/details/release_details.ui:38
-msgid "Label"
-msgstr "Etichetta discografica"
-
-#. This refers to a release date
-#: src/app/components/details/release_details.ui:48
-msgid "Released"
-msgstr "Data di uscita"
-
-#. This refers to a number of tracks
-#: src/app/components/details/release_details.ui:58
-msgid "Tracks"
-msgstr "Traccia"
-
-#. This refers to the duration of a release
-#: src/app/components/details/release_details.ui:68
-msgid "Duration"
-msgstr "Durata"
-
-#: src/app/components/details/release_details.ui:78
-msgid "Copyright"
-msgstr "Copyright"
-
#. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
#: src/app/components/login/login.ui:45
msgid "Login to Spotify Premium"
msgstr "Login su Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Username"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Password"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Il blocco maiuscole è abilitato!"
-
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "Autenticazione fallita!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Log in"
-#. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
-msgid "Cancel"
-msgstr "Annulla"
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:72
+msgid "Albums"
+msgstr "Album"
-#. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
-msgid "Select all"
-msgstr "Seleziona tutto"
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:105
+msgid "Artists"
+msgstr "Artisti"
+
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
+msgid "Saved tracks"
+msgstr "Tracce salvate"
+
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "Riproduci"
#: src/app/components/playback/playback_controls.ui:17
msgid "Shuffle"
@@ -251,6 +162,16 @@ msgstr "Successivo"
msgid "Repeat"
msgstr "Ripeti"
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr "Non hai playlist salvate."
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr "Le tue playlist verranno mostrate qui."
+
#. A title that is shown when the user has not saved any albums.
#: src/app/components/library/library.ui:26
msgid "You have no saved albums."
@@ -261,5 +182,209 @@ msgstr "Non hai album salvati."
msgid "Your library will be shown here."
msgstr "La tua libreria verrà mostrata qui."
-#~ msgid "by"
-#~ msgstr "by"
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} brano selezionato"
+msgstr[1] "{} brani selezionati"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:116
+msgid "Search Spotify."
+msgstr "Cerca Spotify."
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:117
+msgid "Type to search."
+msgstr "Digita per cercare."
+
+#: src/app/components/selection/selection_toolbar.ui:69
+msgid "Remove"
+msgstr "Rimuovi"
+
+#. playlist2-symbolic
+#: src/app/components/selection/selection_toolbar.ui:56
+msgid "Add to playlist..."
+msgstr "Aggiungi alla playlist..."
+
+#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
+#: src/app/components/headerbar/headerbar.ui:47
+msgid "Cancel"
+msgstr "Annulla"
+
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:58
+msgid "Select all"
+msgstr "Seleziona tutto"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from ".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Di più da {}"
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Etichetta discografica"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Data di uscita"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Tracce"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Durata"
+
+#: src/app/components/details/release_details.ui:68
+msgid "Copyright"
+msgstr "Copyright"
+
+#. translators: This is part of a larger label that reads " by "
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr "{} di {}"
+
+#: src/app/components/sidebar/sidebar.rs:48
+msgid "Unnamed playlist"
+msgstr "Playlist senza nome"
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/sidebar/sidebar_item.rs:81
+msgid "All Playlists"
+msgstr "Tutte le playlist"
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr "Tracce salvate!"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: src/main.rs:80
+msgid "Failed to open link!"
+msgstr "Apertura del link fallita!"
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr "Audio"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr "Backend Audio"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr "Device ALSA"
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr "Applicato solo se il backend audio è ALSA"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr "Qualità Audio"
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr "Normale"
+
+#: src/app/components/settings/settings.ui:45
+#, fuzzy
+msgid "High"
+msgstr "Alta"
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr "Molto alta"
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:70
+msgid "Appearance"
+msgstr "Aspetto"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:73
+msgid "Theme"
+msgstr "Tema"
+
+#: src/app/components/settings/settings.ui:77
+msgid "Light"
+msgstr "Chiaro"
+
+#: src/app/components/settings/settings.ui:78
+msgid "Dark"
+msgstr "Scuro"
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:89
+msgid "Network"
+msgstr "Rete"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:92
+msgid "Access Point Port"
+msgstr "Porta Access Point"
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:93
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr "Porta usata per le connessioni all'Access Point Spotify. Impostala a 0 se qualsiasi valore va bene."
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr "Salva nella libreria"
+
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr "Creata nuova playlist."
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr "Visualizza"
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr "Nuova Playlist"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr "Riproduzione gapless"
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr "Sistema"
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr "Fatto"
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr "Nome"
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr "Crea"
+
diff --git a/po/ja.po b/po/ja.po
index 8d14b9c3..b1b16950 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "パスワードを保存できませんでした。セッションキーリングのロックを解除してください。"
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "エラーが発生しました。詳細はログを確認してください。"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "ライブラリ"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "プレイリスト"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "再生中"
@@ -84,7 +84,7 @@ msgstr "終了"
msgid "Log out"
msgstr "ログアウト"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "再接続しました"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Spotifyプレミアムにログイン"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "ユーザー名"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "パスワード"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "認証に失敗しました。"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "ログイン"
@@ -133,16 +133,11 @@ msgstr "アルバム"
msgid "Artists"
msgstr "アーティスト"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "お気に入り"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Caps Lockが有効になっています。"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr "一時停止"
@@ -213,6 +208,7 @@ msgid "Add to playlist..."
msgstr "プレイリストに追加…"
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr "選択解除"
@@ -226,7 +222,7 @@ msgstr "すべて選択"
#: src/app/components/labels.rs:39
#, fuzzy
msgid "More from {}"
-msgstr "詳細"
+msgstr ""
#. This refers to a music label
#: src/app/components/details/release_details.ui:38
@@ -257,12 +253,12 @@ msgstr "著作権表示"
msgid "{} by {}"
msgstr "{} から {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
msgstr ""
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
msgstr ""
@@ -275,7 +271,7 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
msgstr ""
@@ -317,35 +313,35 @@ msgid "Very high"
msgstr ""
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
msgstr ""
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
msgstr ""
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
msgstr ""
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr ""
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
msgstr ""
@@ -353,3 +349,41 @@ msgstr ""
msgid "Save to library"
msgstr ""
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr ""
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr ""
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr ""
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr ""
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr ""
+
diff --git a/po/nb.po b/po/nb.po
index 28c509c4..0f0a7813 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "Kunne ikke lagre passordet. Sørg for at nøkkelringen til sesjonen er låst opp."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "En feil oppstod. Sjekk logger for detaljer!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Bibliotek"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Spillelister"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "Nå spiller"
@@ -84,7 +84,7 @@ msgstr "Avslutt"
msgid "Log out"
msgstr "Logg ut"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Tilkoblingen er gjenopprettet"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Logg på Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Brukernavn"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Passord"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "Autentiseringen mislyktes!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Logg inn"
@@ -133,16 +133,11 @@ msgstr "Album"
msgid "Artists"
msgstr "Artister"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "Lagrede spor"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Caps Lock er aktivert!"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr "Pause"
@@ -215,6 +210,7 @@ msgid "Add to playlist..."
msgstr "Legg til spilleliste..."
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr "Avbryt"
@@ -258,99 +254,137 @@ msgstr "Opphavsrett"
msgid "{} by {}"
msgstr "{} av {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
-msgstr ""
+msgstr "Navnløs spilleliste"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
-msgstr ""
+msgstr "Alle Spillelister"
#: src/app/components/selection/component.rs:66
msgid "Tracks saved!"
-msgstr ""
+msgstr "Spor lagret!"
#. translators: This is a menu entry.
#: src/app/components/user_menu/user_menu.rs:65
msgid "Preferences"
-msgstr ""
+msgstr "Innstillinger"
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
-msgstr ""
+msgstr "Kunne ikke åpne linken!"
#. Header for a group of preference items regarding audio
#: src/app/components/settings/settings.ui:13
msgid "Audio"
-msgstr ""
+msgstr "Lyd"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:16
msgid "Audio Backend"
-msgstr ""
+msgstr "Lyd Backend"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:29
msgid "ALSA Device"
-msgstr ""
+msgstr "ALSA Enhet"
#. Description for the item (ALSA Device) in preferences
#: src/app/components/settings/settings.ui:30
msgid "Applied only if audio backend is ALSA"
-msgstr ""
+msgstr "Brukes bare hvis lyd backend er ALSA"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:40
msgid "Audio Quality"
-msgstr ""
+msgstr "Lyd Kvalitet"
#: src/app/components/settings/settings.ui:44
msgid "Normal"
-msgstr ""
+msgstr "Normal"
#: src/app/components/settings/settings.ui:45
msgid "High"
-msgstr ""
+msgstr "Høy"
#: src/app/components/settings/settings.ui:46
msgid "Very high"
-msgstr ""
+msgstr "Veldig høy"
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
-msgstr ""
+msgstr "Utseende"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
-msgstr ""
+msgstr "Tema"
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
-msgstr ""
+msgstr "Lys"
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
-msgstr ""
+msgstr "Mørk"
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
-msgstr ""
+msgstr "Nettverk"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
-msgstr ""
+msgstr "Aksesspunkt Port"
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
-msgstr ""
+msgstr "Port som brukes for tilkoblinger til Spotify sitt aksesspunkt. Sett til 0 hvis tilfeldig port er greit."
#: src/app/components/selection/selection_toolbar.ui:90
msgid "Save to library"
+msgstr "Lagre til bibliotek"
+
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr ""
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr ""
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr ""
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr ""
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index d94a3cf8..fdc4ae68 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "Het wachtwoord kan niet worden opgeslagen - zorg dat de sessiesleutelhanger ontgrendeld is."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "Er is een fout opgetreden - bekijk het logboek!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Verzameling"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Afspeellijsten"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "Je luistert naar"
@@ -84,7 +84,7 @@ msgstr "Afsluiten"
msgid "Log out"
msgstr "Uitloggen"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "De verbinding is hersteld"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Inloggen op Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Gebruikersnaam"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Wachtwoord"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "Het inloggen is mislukt."
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Inloggen"
@@ -133,16 +133,11 @@ msgstr "Albums"
msgid "Artists"
msgstr "Artiesten"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "Opgeslagen nummers"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Caps Lock is ingeschakeld!"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr "Pauzeren"
@@ -214,6 +209,7 @@ msgid "Add to playlist..."
msgstr "Toevoegen aan afspeellijst…"
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr "Annuleren"
@@ -257,12 +253,12 @@ msgstr "Copyright"
msgid "{} by {}"
msgstr "{} van {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
msgstr "Naamloze afspeellijst"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
msgstr "Alle afspeellijsten"
@@ -275,7 +271,7 @@ msgstr "De nummers zijn opgeslagen!"
msgid "Preferences"
msgstr "Voorkeuren"
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
msgstr "De link kan niet worden geopend!"
@@ -317,35 +313,35 @@ msgid "Very high"
msgstr "Hoogst"
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
msgstr "Vormgeving"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
msgstr "Thema"
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
msgstr "Licht"
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
msgstr "Donker"
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
msgstr "Netwerk"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr "Poort van toegangspunt"
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
msgstr "De poort die wordt gebruikt om verbinding te maken met Spotify's toegangspunt. 0 = elke poort."
@@ -353,3 +349,41 @@ msgstr "De poort die wordt gebruikt om verbinding te maken met Spotify's toegang
msgid "Save to library"
msgstr "Opslaan in verzameling"
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr "De afspeellijst is aangemaakt."
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr "Bekijken"
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr "Nieuwe afspeellijst"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr "Afspelen zonder pauzes"
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr "Systeem"
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr "Klaar"
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr "Naam"
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr "Aanmaken"
+
diff --git a/po/pl.po b/po/pl.po
index 46a8aba1..f1dd1115 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "Nie można zapisać hasła. Upewnij się że narzędzie zarządzające kluczami jest odblokowane."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "Wystąpił błąd. Sprawdź logi po więcej informacji!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Biblioteka"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Playlisty"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "Aktualnie odtwarzane"
@@ -84,7 +84,7 @@ msgstr "Wyjdź"
msgid "Log out"
msgstr "Wyloguj się"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Odzyskano połączenie"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Zaloguj się do Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Nazwa użytkownika"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Hasło"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "Błąd autoryzacji!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Zaloguj"
@@ -133,16 +133,11 @@ msgstr "Albumy"
msgid "Artists"
msgstr "Artyści"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "Zachowane piosenki"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Caps Lock jest włączony!"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr ""
@@ -216,6 +211,7 @@ msgid "Add to playlist..."
msgstr ""
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr ""
@@ -259,12 +255,12 @@ msgstr "Prawa autorskie"
msgid "{} by {}"
msgstr ""
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
msgstr ""
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
msgstr ""
@@ -277,7 +273,7 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
msgstr ""
@@ -319,35 +315,35 @@ msgid "Very high"
msgstr ""
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
msgstr ""
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
msgstr ""
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
msgstr ""
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr ""
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
msgstr ""
@@ -355,3 +351,41 @@ msgstr ""
msgid "Save to library"
msgstr ""
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr ""
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr ""
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr ""
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr ""
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr ""
+
diff --git a/po/pt-br.po b/po/pt-br.po
index 6529d167..eda99ce8 100644
--- a/po/pt-br.po
+++ b/po/pt-br.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "Não foi possível salvar a senha. Verifique se o seu chaveiro de sessão está desbloqueado."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "Ocorreu um erro. Verifique os logs para mais detalhes!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Biblioteca"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Listas de reprodução"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "Tocando agora"
@@ -84,7 +84,7 @@ msgstr "Fechar"
msgid "Log out"
msgstr "Sair"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Conexão reestabelecida"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Entrar no Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Nome de usuário"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Senha"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "A autenticação falhou!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Entrar"
@@ -133,16 +133,11 @@ msgstr "Álbuns"
msgid "Artists"
msgstr "Artistas"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr ""
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr ""
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr ""
@@ -214,6 +209,7 @@ msgid "Add to playlist..."
msgstr ""
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr ""
@@ -257,12 +253,12 @@ msgstr "Copyright"
msgid "{} by {}"
msgstr ""
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
msgstr ""
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
msgstr ""
@@ -275,7 +271,7 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
msgstr ""
@@ -317,35 +313,35 @@ msgid "Very high"
msgstr ""
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
msgstr ""
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
msgstr ""
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
msgstr ""
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr ""
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
msgstr ""
@@ -353,3 +349,41 @@ msgstr ""
msgid "Save to library"
msgstr ""
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr ""
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr ""
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr ""
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr ""
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr ""
+
diff --git a/po/pt.po b/po/pt.po
index 9173087c..502e5590 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "Não foi possível guardar a palavra-passe. Garanta que o chaveiro da sessão está desbloqueado."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "Ocorreu um erro! Verifique os logs para mais detalhes!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Biblioteca"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Listas de reprodução"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "A reproduzir"
@@ -84,7 +84,7 @@ msgstr "Sair"
msgid "Log out"
msgstr "Terminar sessão"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Conexão restaurada"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Autenticar-se no Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Utilizador"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Palavra-passe"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "Autenticação falhou!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Autenticar"
@@ -133,59 +133,54 @@ msgstr "Álbums"
msgid "Artists"
msgstr "Artistas"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
-msgstr ""
-
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr ""
+msgstr "Músicas salvas"
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
-msgstr ""
+msgstr "Pausar"
#: src/app/components/playback/playback_controls.rs:66
msgid "Play"
-msgstr ""
+msgstr "Tocar"
#: src/app/components/playback/playback_controls.ui:17
msgid "Shuffle"
-msgstr ""
+msgstr "Misturar"
#: src/app/components/playback/playback_controls.ui:27
msgid "Previous"
-msgstr ""
+msgstr "Anterior"
#: src/app/components/playback/playback_controls.ui:50
msgid "Next"
-msgstr ""
+msgstr "Próximo"
#: src/app/components/playback/playback_controls.ui:60
msgid "Repeat"
-msgstr ""
+msgstr "Repetir"
#. A title that is shown when the user has not saved any playlists.
#: src/app/components/saved_playlists/saved_playlists.ui:26
msgid "You have no saved playlists."
-msgstr ""
+msgstr "Não tem listas de reprodução salvas."
#. A description of what happens when the user has saved playlists.
#: src/app/components/saved_playlists/saved_playlists.ui:27
msgid "Your playlists will be shown here."
-msgstr ""
+msgstr "As tuas listas de reprodução aparecerão aqui."
#. A title that is shown when the user has not saved any albums.
#: src/app/components/library/library.ui:26
msgid "You have no saved albums."
-msgstr ""
+msgstr "Não tens albúns salvos."
#. A description of what happens when the user has saved albums.
#: src/app/components/library/library.ui:27
msgid "Your library will be shown here."
-msgstr ""
+msgstr "A tua biblioteca vai aparecer aqui."
#. translators: This shows up when in selection mode. This text should be as short as possible.
#: src/app/components/labels.rs:30
@@ -197,31 +192,32 @@ msgstr[1] "{} canções selecionadas"
#. Title for the empty search page (initial state).
#: src/app/components/search/search.ui:116
msgid "Search Spotify."
-msgstr ""
+msgstr "Procurar no Spotify."
#. Subtitle for the empty search page (initial state).
#: src/app/components/search/search.ui:117
msgid "Type to search."
-msgstr ""
+msgstr "Escrever para pesquisar."
#: src/app/components/selection/selection_toolbar.ui:69
msgid "Remove"
-msgstr ""
+msgstr "Remover"
#. playlist2-symbolic
#: src/app/components/selection/selection_toolbar.ui:56
msgid "Add to playlist..."
-msgstr ""
+msgstr "Adicionar à lista de reprodução..."
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
#. Button label. Selects all visible songs.
#: src/app/components/headerbar/headerbar.ui:58
msgid "Select all"
-msgstr ""
+msgstr "Selecionar todos"
#. translators: This is part of a contextual menu attached to a single track; the full text is "More from ".
#: src/app/components/labels.rs:39
@@ -255,101 +251,139 @@ msgstr "Copyright"
#. translators: This is part of a larger label that reads " by "
#: src/app/components/labels.rs:48
msgid "{} by {}"
-msgstr ""
+msgstr "{} por {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
-msgstr ""
+msgstr "Lista de reprodução sem nome"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
-msgstr ""
+msgstr "Todas as listas de reprodução"
#: src/app/components/selection/component.rs:66
msgid "Tracks saved!"
-msgstr ""
+msgstr "Músicas salvas!"
#. translators: This is a menu entry.
#: src/app/components/user_menu/user_menu.rs:65
msgid "Preferences"
-msgstr ""
+msgstr "Preferências"
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
-msgstr ""
+msgstr "Falha ao abrir a ligação!"
#. Header for a group of preference items regarding audio
#: src/app/components/settings/settings.ui:13
msgid "Audio"
-msgstr ""
+msgstr "Áudio"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:16
msgid "Audio Backend"
-msgstr ""
+msgstr "Back-end de Áudio"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:29
msgid "ALSA Device"
-msgstr ""
+msgstr "Dispositivo ALSA"
#. Description for the item (ALSA Device) in preferences
#: src/app/components/settings/settings.ui:30
msgid "Applied only if audio backend is ALSA"
-msgstr ""
+msgstr "Aplicado apenas se back-end do áudio é ALSA"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:40
msgid "Audio Quality"
-msgstr ""
+msgstr "Qualidade do Áudio"
#: src/app/components/settings/settings.ui:44
msgid "Normal"
-msgstr ""
+msgstr "Normal"
#: src/app/components/settings/settings.ui:45
msgid "High"
-msgstr ""
+msgstr "Alta"
#: src/app/components/settings/settings.ui:46
msgid "Very high"
-msgstr ""
+msgstr "Muito Alta"
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
-msgstr ""
+msgstr "Aparência"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
-msgstr ""
+msgstr "Tema"
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
-msgstr ""
+msgstr "Claro"
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
-msgstr ""
+msgstr "Escuro"
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
-msgstr ""
+msgstr "Rede"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
-msgstr ""
+msgstr "Porta do Ponto de Acesso"
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
-msgstr ""
+msgstr "Porta usada para conexões ao Ponto de Acesso do Spotify. Definir para 0 se qualquer porta servir."
#: src/app/components/selection/selection_toolbar.ui:90
msgid "Save to library"
-msgstr ""
+msgstr "Salvar na biblioteca"
+
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr "Nova lista de reprodução criada."
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr "Ver"
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr "Nova lista de reprodução"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr "Reprodução sem intervalos"
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr "Sistema"
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr "Feito"
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr "Nome"
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr "Criar"
diff --git a/po/ru.po b/po/ru.po
index 140c34fe..d1141f09 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "Не удалось сохранить пароль. Убедитесь, что связка ключей сеанса разблокирована."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "Произошла ошибка. Смотрите подробности в логах!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Фонотека"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Плейлисты"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "Воспроизводится сейчас"
@@ -84,7 +84,7 @@ msgstr "Выйти из программы"
msgid "Log out"
msgstr "Выйти из аккаунта"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Подключение восстановлено"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Войти в Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Имя аккаунта"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Пароль"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "Вход не удался!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Войти"
@@ -133,16 +133,11 @@ msgstr "Альбомы"
msgid "Artists"
msgstr "Исполнители"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "Сохраненные треки"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Caps Lock включен!"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr "Пауза"
@@ -216,6 +211,7 @@ msgid "Add to playlist..."
msgstr "Добавить в плейлист..."
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr "Отменить"
@@ -259,99 +255,137 @@ msgstr "Авторское право"
msgid "{} by {}"
msgstr "{} в исполнении {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
-msgstr ""
+msgstr "Безымянный плейлист"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
-msgstr ""
+msgstr "Все плейлисты"
#: src/app/components/selection/component.rs:66
msgid "Tracks saved!"
-msgstr ""
+msgstr "Треки сохранены!"
#. translators: This is a menu entry.
#: src/app/components/user_menu/user_menu.rs:65
msgid "Preferences"
-msgstr ""
+msgstr "Настройки"
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
-msgstr ""
+msgstr "Не удалось открыть ссылку!"
#. Header for a group of preference items regarding audio
#: src/app/components/settings/settings.ui:13
msgid "Audio"
-msgstr ""
+msgstr "Аудио"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:16
msgid "Audio Backend"
-msgstr ""
+msgstr "Аудио Бэкэнд"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:29
msgid "ALSA Device"
-msgstr ""
+msgstr "ALSA Device"
#. Description for the item (ALSA Device) in preferences
#: src/app/components/settings/settings.ui:30
msgid "Applied only if audio backend is ALSA"
-msgstr ""
+msgstr "Применяется, только если звуковой бэкэнд ALSA"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:40
msgid "Audio Quality"
-msgstr ""
+msgstr "Качество звука"
#: src/app/components/settings/settings.ui:44
msgid "Normal"
-msgstr ""
+msgstr "Нормальное"
#: src/app/components/settings/settings.ui:45
msgid "High"
-msgstr ""
+msgstr "Высокое"
#: src/app/components/settings/settings.ui:46
msgid "Very high"
-msgstr ""
+msgstr "Очень высокое"
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
-msgstr ""
+msgstr "Внешний вид"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
-msgstr ""
+msgstr "Тема"
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
-msgstr ""
+msgstr "Светлая"
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
-msgstr ""
+msgstr "Темная"
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
-msgstr ""
+msgstr "Сеть"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
-msgstr ""
+msgstr "Порт точки доступа"
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
-msgstr ""
+msgstr "Порт, используемый для подключения к точке доступа Spotify. Установите на 0, если все порты в порядке."
#: src/app/components/selection/selection_toolbar.ui:90
msgid "Save to library"
-msgstr ""
+msgstr "Сохранить в библиотеку"
+
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr "Создан новый плейлист."
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr "Вид"
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr "Новый плейлист"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr "Непрерывное воспроизведение"
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr "Система"
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr "Сделано"
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr "Имя"
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr "Создать"
diff --git a/po/sl.po b/po/sl.po
index fa55a402..ff90a559 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "Gesla ni bilo mogoče shraniti. Preveri, da je session keyring odklenjen."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "Napaka! Poglej v dnevnik od programa za podrobnosti."
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Moja zbirka"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Seznami predvajanja"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "Se predvaja"
@@ -84,7 +84,7 @@ msgstr "Izhod"
msgid "Log out"
msgstr "Odjava"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Povezava ponovno vzpovstavljena"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Prijava v Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Uporabniško ime"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Geslo"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "Preverjanje pristnosti ni bilo uspešno!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Prijava"
@@ -133,16 +133,11 @@ msgstr "Albumi"
msgid "Artists"
msgstr "Izvajalci"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr "Shranjene skladbe"
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr "Velike črke so vklopljene!"
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr "Premor"
@@ -216,6 +211,7 @@ msgid "Add to playlist..."
msgstr "Dodaj na seznam predvajanja..."
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr "Prekliči"
@@ -259,12 +255,12 @@ msgstr "Avtorska pravica"
msgid "{} by {}"
msgstr "{} od {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
msgstr ""
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
msgstr ""
@@ -277,7 +273,7 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
msgstr ""
@@ -319,35 +315,35 @@ msgid "Very high"
msgstr ""
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
msgstr ""
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
msgstr ""
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
msgstr ""
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr ""
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
msgstr ""
@@ -355,3 +351,41 @@ msgstr ""
msgid "Save to library"
msgstr ""
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr ""
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr ""
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr ""
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr ""
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr ""
+
diff --git a/po/spot.pot b/po/spot.pot
index b9fd689b..aeb5a665 100644
--- a/po/spot.pot
+++ b/po/spot.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: spot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-28 00:21+0200\n"
+"POT-Creation-Date: 2023-02-19 17:27-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr ""
@@ -72,35 +72,37 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr ""
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr ""
#. translators: This is a sidebar entry that marks that the entries below are playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr ""
#. translators: This is a sidebar entry to browse to saved tracks.
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr ""
-#: src/app/components/navigation/home.rs:32
-msgid "Unnamed playlist"
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
msgstr ""
-#: src/app/components/navigation/home.rs:87
-#: src/app/components/now_playing/now_playing_model.rs:134
-msgid "Now playing"
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
msgstr ""
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
-msgid "All Playlists"
+#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
+msgid "Now playing"
msgstr ""
#: src/app/components/playback/playback_controls.rs:64
@@ -122,6 +124,18 @@ msgstr ""
msgid "Tracks saved!"
msgstr ""
+#: src/app/components/sidebar/sidebar_item.rs:81
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar.rs:48
+msgid "Unnamed playlist"
+msgstr ""
+
#. translators: This is a menu entry.
#: src/app/components/user_menu/user_menu.rs:65
msgid "Preferences"
@@ -142,11 +156,11 @@ msgstr ""
msgid "Log out"
msgstr ""
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr ""
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
msgstr ""
@@ -227,36 +241,45 @@ msgstr ""
msgid "Very high"
msgstr ""
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr ""
+
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
msgstr ""
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
msgstr ""
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
msgstr ""
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr ""
+
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr ""
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid ""
"Port used for connections to Spotify's Access Point. Set to 0 if any port is "
"fine."
@@ -319,16 +342,33 @@ msgstr ""
msgid "Log in"
msgstr ""
+#. Exit playlist edition
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr ""
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr ""
+
#. Button label. Selects all visible songs.
#: src/app/components/headerbar/headerbar.ui:58
msgid "Select all"
msgstr ""
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr ""
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr ""
+
#: src/app/components/playback/playback_controls.ui:17
msgid "Shuffle"
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 5637788d..34796801 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -37,28 +37,28 @@ msgstr "{} listesine ekle"
#. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
#: src/app/components/login/login_model.rs:56
msgid "Could not save password. Make sure the session keyring is unlocked."
-msgstr "Şifreniz kaydedilemedi. Oturum anahtarlığınızın kilidinin açık olduğundan emin olun."
+msgstr "Parola kaydedilemedi. Oturum anahtarlığınızın kilidinin açık olduğundan emin olun."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "Bir hata meydana geldi. Günlükleri kontrol edin."
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Kütüphane"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Oynatma listesi"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "Şu an oynatılıyor"
@@ -77,14 +77,14 @@ msgstr "Hakkında"
#. translators: This is a menu entry.
#: src/app/components/user_menu/user_menu.rs:69
msgid "Quit"
-msgstr "Çıkış"
+msgstr "Çık"
#. translators: This is a menu entry.
#: src/app/components/user_menu/user_menu.rs:74
msgid "Log out"
msgstr "Oturumdan çık"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "Bağlantı geri yüklendi."
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Spotify Premium'a giriş yap"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Kullanıcı adı"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
-msgstr "Şifre"
+msgstr "Parola"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "Kimlik doğrulama başarısız."
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Giriş yap"
@@ -133,59 +133,54 @@ msgstr "Albümler"
msgid "Artists"
msgstr "Sanatçılar"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
-msgstr ""
-
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr ""
+msgstr "Kaydedilen parçalar"
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
-msgstr ""
+msgstr "Durdur"
#: src/app/components/playback/playback_controls.rs:66
msgid "Play"
-msgstr ""
+msgstr "Oynat"
#: src/app/components/playback/playback_controls.ui:17
msgid "Shuffle"
-msgstr ""
+msgstr "Karıştır"
#: src/app/components/playback/playback_controls.ui:27
msgid "Previous"
-msgstr ""
+msgstr "Önceki"
#: src/app/components/playback/playback_controls.ui:50
msgid "Next"
-msgstr ""
+msgstr "Sonraki"
#: src/app/components/playback/playback_controls.ui:60
msgid "Repeat"
-msgstr ""
+msgstr "Yinele"
#. A title that is shown when the user has not saved any playlists.
#: src/app/components/saved_playlists/saved_playlists.ui:26
msgid "You have no saved playlists."
-msgstr ""
+msgstr "Kaydedilmiş oynatma listeniz yok."
#. A description of what happens when the user has saved playlists.
#: src/app/components/saved_playlists/saved_playlists.ui:27
msgid "Your playlists will be shown here."
-msgstr ""
+msgstr "Oynatma listeniz burada gösterilir."
#. A title that is shown when the user has not saved any albums.
#: src/app/components/library/library.ui:26
msgid "You have no saved albums."
-msgstr ""
+msgstr "Kaydedilmiş ablümünüz yok."
#. A description of what happens when the user has saved albums.
#: src/app/components/library/library.ui:27
msgid "Your library will be shown here."
-msgstr ""
+msgstr "Kütüphaneniz burada gösterilir."
#. translators: This shows up when in selection mode. This text should be as short as possible.
#: src/app/components/labels.rs:30
@@ -197,31 +192,32 @@ msgstr[1] "{} seçildi"
#. Title for the empty search page (initial state).
#: src/app/components/search/search.ui:116
msgid "Search Spotify."
-msgstr ""
+msgstr "Spotify'da Ara."
#. Subtitle for the empty search page (initial state).
#: src/app/components/search/search.ui:117
msgid "Type to search."
-msgstr ""
+msgstr "Aramak için yazın."
#: src/app/components/selection/selection_toolbar.ui:69
msgid "Remove"
-msgstr ""
+msgstr "Kaldır"
#. playlist2-symbolic
#: src/app/components/selection/selection_toolbar.ui:56
msgid "Add to playlist..."
-msgstr ""
+msgstr "Oynatma listesine ekle..."
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
-msgstr ""
+msgstr "İptal Et"
#. Button label. Selects all visible songs.
#: src/app/components/headerbar/headerbar.ui:58
msgid "Select all"
-msgstr ""
+msgstr "Tümünü seç"
#. translators: This is part of a contextual menu attached to a single track; the full text is "More from ".
#: src/app/components/labels.rs:39
@@ -231,127 +227,163 @@ msgstr "Daha fazla {}"
#. This refers to a music label
#: src/app/components/details/release_details.ui:38
msgid "Label"
-msgstr ""
+msgstr "Yayıncı"
#. This refers to a release date
#: src/app/components/details/release_details.ui:48
-#, fuzzy
msgid "Released"
-msgstr "Parçalar"
+msgstr "Yayın tarihi"
#. This refers to a number of tracks
#: src/app/components/details/release_details.ui:58
-#, fuzzy
msgid "Tracks"
-msgstr "En çok dinlenenler"
+msgstr "Parça"
#. This refers to the duration of a release
#: src/app/components/details/release_details.ui:68
msgid "Duration"
-msgstr ""
+msgstr "Süre"
#: src/app/components/details/release_details.ui:68
msgid "Copyright"
-msgstr ""
+msgstr "Telif hakkı"
#. translators: This is part of a larger label that reads " by "
#: src/app/components/labels.rs:48
msgid "{} by {}"
-msgstr ""
+msgstr "{}, {}"
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
-msgstr ""
+msgstr "Adsız oynatma listesi"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
-msgstr ""
+msgstr "Tüm Oynatma Listeleri"
#: src/app/components/selection/component.rs:66
msgid "Tracks saved!"
-msgstr ""
+msgstr "Parçalar kaydedildi!"
#. translators: This is a menu entry.
#: src/app/components/user_menu/user_menu.rs:65
msgid "Preferences"
-msgstr ""
+msgstr "Tercihler"
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
-msgstr ""
+msgstr "Bağlantı açılamadı!"
#. Header for a group of preference items regarding audio
#: src/app/components/settings/settings.ui:13
msgid "Audio"
-msgstr ""
+msgstr "Ses"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:16
msgid "Audio Backend"
-msgstr ""
+msgstr "Ses Arka Ucu"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:29
msgid "ALSA Device"
-msgstr ""
+msgstr "ALSA Aygıtı"
#. Description for the item (ALSA Device) in preferences
#: src/app/components/settings/settings.ui:30
msgid "Applied only if audio backend is ALSA"
-msgstr ""
+msgstr "Sadece, ses arka ucu ALSA ise uygulanır"
#. Title for an item in preferences
#: src/app/components/settings/settings.ui:40
msgid "Audio Quality"
-msgstr ""
+msgstr "Ses Kalitesi"
#: src/app/components/settings/settings.ui:44
msgid "Normal"
-msgstr ""
+msgstr "Normal"
#: src/app/components/settings/settings.ui:45
msgid "High"
-msgstr ""
+msgstr "Yüksek"
#: src/app/components/settings/settings.ui:46
msgid "Very high"
-msgstr ""
+msgstr "Çok yüksek"
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
-msgstr ""
+msgstr "Görünüm"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
-msgstr ""
+msgstr "Tema"
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
-msgstr ""
+msgstr "Açık"
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
-msgstr ""
+msgstr "Koyu"
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
-msgstr ""
+msgstr "Ağ"
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
-msgstr ""
+msgstr "Erişim Noktası Bağlantı Noktası"
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
-msgstr ""
+msgstr "Spotify Erişim Noktasına bağlanmak için kullanılan bağlantı noktası. Herhangi bir bağlantı noktası iyiyse 0'a ayarlayın."
#: src/app/components/selection/selection_toolbar.ui:90
msgid "Save to library"
-msgstr ""
+msgstr "Kütüphaneye kaydet"
+
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr "Yeni çalma listesi oluşturuldu."
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr "Görünüm"
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr "Yeni Çalma Listesi"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr "Kesintisiz çalma"
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr "Sistem"
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr "Bitti"
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr "Ad"
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr "Oluştur"
diff --git a/po/uk.po b/po/uk.po
index ec336439..fef57652 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr "Не вдалося зберегти пароль. Переконайтесь, що зв'язка ключів сеансу розблокована."
#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:128
msgid "An error occured. Check logs for details!"
msgstr "Сталася помилка. Перевірте журнал для детальної інформації!"
#. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:32
-#: src/app/components/navigation/home.rs:68
+#: src/app/components/navigation/factory.rs:33
+#: src/app/components/sidebar/sidebar_item.rs:39
msgid "Library"
msgstr "Бібліотека"
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:51
-#: src/app/components/navigation/home.rs:94
+#: src/app/components/navigation/factory.rs:54
+#: src/app/components/sidebar/sidebar_item.rs:45
msgid "Playlists"
msgstr "Плейлисти"
#. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:87
#: src/app/components/now_playing/now_playing_model.rs:134
+#: src/app/components/sidebar/sidebar_item.rs:43
msgid "Now playing"
msgstr "Відтворюється зараз"
@@ -84,7 +84,7 @@ msgstr "Вийти з програми"
msgid "Log out"
msgstr "Вийти з аккаунту"
-#: src/app/state/login_state.rs:110
+#: src/app/state/login_state.rs:112
msgid "Connection restored"
msgstr "З'єднання відновлено"
@@ -104,22 +104,22 @@ msgid "Login to Spotify Premium"
msgstr "Увійти в Spotify Premium"
#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
+#: src/app/components/login/login.ui:72
msgid "Username"
msgstr "Логін"
#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
+#: src/app/components/login/login.ui:89
msgid "Password"
msgstr "Пароль"
#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
+#: src/app/components/login/login.ui:114
msgid "Authentication failed!"
msgstr "Помилка входу!"
#. Log in button label
-#: src/app/components/login/login.ui:141
+#: src/app/components/login/login.ui:129
msgid "Log in"
msgstr "Увійти"
@@ -133,16 +133,11 @@ msgstr "Альбоми"
msgid "Artists"
msgstr "Виконавці"
-#: src/app/components/navigation/factory.rs:82
-#: src/app/components/navigation/home.rs:78
+#: src/app/components/navigation/factory.rs:85
+#: src/app/components/sidebar/sidebar_item.rs:41
msgid "Saved tracks"
msgstr ""
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
-msgstr ""
-
#: src/app/components/playback/playback_controls.rs:64
msgid "Pause"
msgstr ""
@@ -216,6 +211,7 @@ msgid "Add to playlist..."
msgstr ""
#. Button label. Exits selection mode.
+#: src/app/components/playlist_details/playlist_headerbar.ui:50
#: src/app/components/headerbar/headerbar.ui:47
msgid "Cancel"
msgstr ""
@@ -259,12 +255,12 @@ msgstr ""
msgid "{} by {}"
msgstr ""
-#: src/app/components/navigation/home.rs:32
+#: src/app/components/sidebar/sidebar.rs:48
msgid "Unnamed playlist"
msgstr ""
#. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/home.rs:104
+#: src/app/components/sidebar/sidebar_item.rs:81
msgid "All Playlists"
msgstr ""
@@ -277,7 +273,7 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: src/main.rs:81
+#: src/main.rs:80
msgid "Failed to open link!"
msgstr ""
@@ -319,35 +315,35 @@ msgid "Very high"
msgstr ""
#. Header for a group of preference items regarding the application's appearance
-#: src/app/components/settings/settings.ui:56
+#: src/app/components/settings/settings.ui:70
msgid "Appearance"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:59
+#: src/app/components/settings/settings.ui:73
msgid "Theme"
msgstr ""
-#: src/app/components/settings/settings.ui:63
+#: src/app/components/settings/settings.ui:77
msgid "Light"
msgstr ""
-#: src/app/components/settings/settings.ui:64
+#: src/app/components/settings/settings.ui:78
msgid "Dark"
msgstr ""
#. Header for a group of preference items regarding network
-#: src/app/components/settings/settings.ui:74
+#: src/app/components/settings/settings.ui:89
msgid "Network"
msgstr ""
#. Title for an item in preferences
-#: src/app/components/settings/settings.ui:77
+#: src/app/components/settings/settings.ui:92
msgid "Access Point Port"
msgstr ""
#. Longer description for an item (Access Point Port) in preferences
-#: src/app/components/settings/settings.ui:78
+#: src/app/components/settings/settings.ui:93
msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
msgstr ""
@@ -355,3 +351,41 @@ msgstr ""
msgid "Save to library"
msgstr ""
+#. translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+#: src/app/components/notification/mod.rs:25
+msgid "New playlist created."
+msgstr ""
+
+#. translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+#: src/app/components/notification/mod.rs:27
+msgid "View"
+msgstr ""
+
+#: src/app/components/sidebar/sidebar_item.rs:90
+msgid "New Playlist"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:54
+msgid "Gapless playback"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:79
+msgid "System"
+msgstr ""
+
+#. Finish playlist edition
+#: src/app/components/playlist_details/playlist_headerbar.ui:63
+msgid "Done"
+msgstr ""
+
+#. label for the entry containing the name of a new playlist
+#: src/app/components/sidebar/create_playlist.ui:10
+msgid "Name"
+msgstr ""
+
+#. Button that creates a new playlist
+#: src/app/components/sidebar/create_playlist.ui:33
+msgid "Create"
+msgstr ""
+
diff --git a/src/api/api_models.rs b/src/api/api_models.rs
index b96f1592..8dbbb6b1 100644
--- a/src/api/api_models.rs
+++ b/src/api/api_models.rs
@@ -8,6 +8,11 @@ use std::{
use crate::app::models::*;
+#[derive(Serialize)]
+pub struct PlaylistDetails {
+ pub name: String,
+}
+
#[derive(Serialize)]
pub struct Uris {
pub uris: Vec,
@@ -18,6 +23,11 @@ pub struct Ids {
pub ids: Vec,
}
+#[derive(Serialize)]
+pub struct Name<'a> {
+ pub name: &'a str,
+}
+
pub enum SearchType {
Artist,
Album,
diff --git a/src/api/cache.rs b/src/api/cache.rs
index e2359a7a..fd2fd54d 100644
--- a/src/api/cache.rs
+++ b/src/api/cache.rs
@@ -99,7 +99,7 @@ impl CacheManager {
fn cache_meta_path(&self, resource: &str) -> PathBuf {
let full = resource.to_string() + EXPIRY_FILE_EXT;
- self.root.join(&full)
+ self.root.join(full)
}
}
@@ -118,7 +118,7 @@ impl CacheManager {
duration.copy_from_slice(&buffer[..OFFSET]);
let duration = Duration::from_secs(u64::from_be_bytes(duration));
- let etag = String::from_utf8((&buffer[OFFSET..]).to_vec()).ok();
+ let etag = String::from_utf8(buffer[OFFSET..].to_vec()).ok();
Ok(CacheExpiry::AtUnixTimestamp(duration, etag))
}
diff --git a/src/api/cached_client.rs b/src/api/cached_client.rs
index c7702cd8..e975099f 100644
--- a/src/api/cached_client.rs
+++ b/src/api/cached_client.rs
@@ -57,8 +57,16 @@ pub trait SpotifyApiClient {
fn add_to_playlist(&self, id: &str, uris: Vec) -> BoxFuture>;
+ fn create_new_playlist(
+ &self,
+ name: &str,
+ user_id: &str,
+ ) -> BoxFuture>;
+
fn remove_from_playlist(&self, id: &str, uris: Vec) -> BoxFuture>;
+ fn update_playlist_details(&self, id: &str, name: String) -> BoxFuture>;
+
fn search(
&self,
query: &str,
@@ -311,6 +319,27 @@ impl SpotifyApiClient for CachedSpotifyClient {
})
}
+ fn create_new_playlist(
+ &self,
+ name: &str,
+ user_id: &str,
+ ) -> BoxFuture> {
+ let name = name.to_owned();
+ let user_id = user_id.to_owned();
+
+ Box::pin(async move {
+ let playlist = self
+ .client
+ .create_new_playlist(&name, &user_id)
+ .send()
+ .await?
+ .deserialize()
+ .unwrap();
+
+ Ok(playlist.into())
+ })
+ }
+
fn remove_from_playlist(&self, id: &str, uris: Vec) -> BoxFuture> {
let id = id.to_owned();
@@ -328,6 +357,24 @@ impl SpotifyApiClient for CachedSpotifyClient {
})
}
+ fn update_playlist_details(&self, id: &str, name: String) -> BoxFuture> {
+ let id = id.to_owned();
+
+ Box::pin(async move {
+ self.cache
+ .set_expired_pattern(&playlist_cache_key(&id))
+ .await
+ .unwrap_or(());
+
+ self.client
+ .update_playlist_details(&id, name)
+ .send_no_response()
+ .await?;
+
+ Ok(())
+ })
+ }
+
fn get_album(&self, id: &str) -> BoxFuture> {
let id = id.to_owned();
@@ -359,7 +406,7 @@ impl SpotifyApiClient for CachedSpotifyClient {
let id = id.to_owned();
Box::pin(async move {
- let _ = self.cache.set_expired_pattern(&*ME_ALBUMS_CACHE).await;
+ let _ = self.cache.set_expired_pattern(&ME_ALBUMS_CACHE).await;
self.client.save_album(&id).send_no_response().await?;
self.get_album(&id[..]).await.map(|a| a.description)
})
@@ -367,7 +414,7 @@ impl SpotifyApiClient for CachedSpotifyClient {
fn save_tracks(&self, ids: Vec) -> BoxFuture> {
Box::pin(async move {
- let _ = self.cache.set_expired_pattern(&*ME_TRACKS_CACHE).await;
+ let _ = self.cache.set_expired_pattern(&ME_TRACKS_CACHE).await;
self.client.save_tracks(ids).send_no_response().await?;
Ok(())
})
@@ -377,14 +424,14 @@ impl SpotifyApiClient for CachedSpotifyClient {
let id = id.to_owned();
Box::pin(async move {
- let _ = self.cache.set_expired_pattern(&*ME_ALBUMS_CACHE).await;
+ let _ = self.cache.set_expired_pattern(&ME_ALBUMS_CACHE).await;
self.client.remove_saved_album(&id).send_no_response().await
})
}
fn remove_saved_tracks(&self, ids: Vec) -> BoxFuture> {
Box::pin(async move {
- let _ = self.cache.set_expired_pattern(&*ME_TRACKS_CACHE).await;
+ let _ = self.cache.set_expired_pattern(&ME_TRACKS_CACHE).await;
self.client
.remove_saved_tracks(ids)
.send_no_response()
diff --git a/src/api/client.rs b/src/api/client.rs
index 13022f50..70b9c8ba 100644
--- a/src/api/client.rs
+++ b/src/api/client.rs
@@ -417,6 +417,17 @@ impl SpotifyClient {
.json_body(Uris { uris })
}
+ pub(crate) fn create_new_playlist(
+ &self,
+ name: &str,
+ user_id: &str,
+ ) -> SpotifyRequest<'_, Vec, Playlist> {
+ self.request()
+ .method(Method::POST)
+ .uri(format!("/v1/users/{}/playlists", user_id), None)
+ .json_body(Name { name })
+ }
+
pub(crate) fn remove_from_playlist(
&self,
playlist: &str,
@@ -428,6 +439,17 @@ impl SpotifyClient {
.json_body(Uris { uris })
}
+ pub(crate) fn update_playlist_details(
+ &self,
+ playlist: &str,
+ name: String,
+ ) -> SpotifyRequest<'_, Vec, ()> {
+ self.request()
+ .method(Method::PUT)
+ .uri(format!("/v1/playlists/{}", playlist), None)
+ .json_body(PlaylistDetails { name })
+ }
+
pub(crate) fn get_saved_albums(
&self,
offset: usize,
diff --git a/src/api/mod.rs b/src/api/mod.rs
index 8d986401..bfd03a51 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -9,7 +9,7 @@ pub use client::SpotifyApiError;
pub async fn clear_user_cache() -> Option<()> {
cache::CacheManager::for_dir("spot/net")?
- .clear_cache_pattern(&*cached_client::USER_CACHE)
+ .clear_cache_pattern(&cached_client::USER_CACHE)
.await
.ok()
}
diff --git a/src/app.css b/src/app.css
index 762abf36..dd23e94d 100644
--- a/src/app.css
+++ b/src/app.css
@@ -8,4 +8,8 @@
.container--loaded {
opacity: 1;
+}
+
+.playlist__title-entry--ro {
+ background: none;
}
\ No newline at end of file
diff --git a/src/app/components/album/album.rs b/src/app/components/album/album.rs
index 014eb858..77dd80f9 100644
--- a/src/app/components/album/album.rs
+++ b/src/app/components/album/album.rs
@@ -38,7 +38,7 @@ mod imp {
type ParentType = libadwaita::Bin;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -58,7 +58,7 @@ glib::wrapper! {
impl AlbumWidget {
pub fn new() -> Self {
display_add_css_provider(resource!("/components/album.css"));
- glib::Object::new(&[]).expect("Failed to create an instance of AlbumWidget")
+ glib::Object::new()
}
pub fn for_model(album_model: &AlbumModel, worker: Worker) -> Self {
@@ -73,21 +73,19 @@ impl AlbumWidget {
}
fn set_image(&self, pixbuf: Option<&gdk_pixbuf::Pixbuf>) {
- imp::AlbumWidget::from_instance(self)
- .cover_image
- .set_from_pixbuf(pixbuf);
+ self.imp().cover_image.set_from_pixbuf(pixbuf);
}
fn bind(&self, album_model: &AlbumModel, worker: Worker) {
- let widget = imp::AlbumWidget::from_instance(self);
+ let widget = self.imp();
widget.cover_image.set_overflow(gtk::Overflow::Hidden);
- if let Some(url) = album_model.cover_url() {
+ if let Some(cover_art) = album_model.cover() {
let _self = self.downgrade();
worker.send_local_task(async move {
if let Some(_self) = _self.upgrade() {
let loader = ImageLoader::new();
- let result = loader.load_remote(&url, "jpg", 200, 200).await;
+ let result = loader.load_remote(&cover_art, "jpg", 200, 200).await;
_self.set_image(result.as_ref());
_self.set_loaded();
}
@@ -106,21 +104,18 @@ impl AlbumWidget {
.flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE)
.build();
- match album_model.year() {
- Some(_) => {
- album_model
- .bind_property("year", &*widget.year_label, "label")
- .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE)
- .build();
- }
- None => {
- widget.year_label.hide();
- }
+ if album_model.year() > 0 {
+ album_model
+ .bind_property("year", &*widget.year_label, "label")
+ .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE)
+ .build();
+ } else {
+ widget.year_label.hide();
}
}
pub fn connect_album_pressed(&self, f: F) {
- imp::AlbumWidget::from_instance(self)
+ self.imp()
.cover_btn
.connect_clicked(clone!(@weak self as _self => move |_| {
f(&_self);
diff --git a/src/app/components/artist/mod.rs b/src/app/components/artist/mod.rs
index 3d3cac04..46dd29c3 100644
--- a/src/app/components/artist/mod.rs
+++ b/src/app/components/artist/mod.rs
@@ -30,7 +30,7 @@ mod imp {
type ParentType = gtk::Box;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -49,7 +49,7 @@ glib::wrapper! {
impl ArtistWidget {
pub fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create an instance of ArtistWidget")
+ glib::Object::new()
}
pub fn for_model(model: &ArtistModel, worker: Worker) -> Self {
@@ -59,7 +59,7 @@ impl ArtistWidget {
}
pub fn connect_artist_pressed(&self, f: F) {
- imp::ArtistWidget::from_instance(self)
+ self.imp()
.avatar_btn
.connect_clicked(clone!(@weak self as _self => move |_| {
f(&_self);
@@ -67,9 +67,9 @@ impl ArtistWidget {
}
fn bind(&self, model: &ArtistModel, worker: Worker) {
- let widget = imp::ArtistWidget::from_instance(self);
+ let widget = self.imp();
- if let Some(url) = model.image_url() {
+ if let Some(url) = model.image() {
let avatar = widget.avatar.downgrade();
worker.send_local_task(async move {
if let Some(avatar) = avatar.upgrade() {
diff --git a/src/app/components/artist_details/artist_details.rs b/src/app/components/artist_details/artist_details.rs
index 729a81f1..3d3fdd78 100644
--- a/src/app/components/artist_details/artist_details.rs
+++ b/src/app/components/artist_details/artist_details.rs
@@ -35,7 +35,7 @@ mod imp {
type ParentType = gtk::Box;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -55,15 +55,11 @@ glib::wrapper! {
impl ArtistDetailsWidget {
fn new() -> Self {
display_add_css_provider(resource!("/components/artist_details.css"));
- glib::Object::new(&[]).expect("Failed to create an instance of ArtistDetailsWidget")
- }
-
- fn widget(&self) -> &imp::ArtistDetailsWidget {
- imp::ArtistDetailsWidget::from_instance(self)
+ glib::Object::new()
}
fn top_tracks_widget(&self) -> >k::ListView {
- self.widget().top_tracks.as_ref()
+ self.imp().top_tracks.as_ref()
}
fn set_loaded(&self) {
@@ -75,7 +71,7 @@ impl ArtistDetailsWidget {
where
F: Fn() + 'static,
{
- self.widget()
+ self.imp()
.scrolled_window
.connect_edge_reached(move |_, pos| {
if let gtk::PositionType::Bottom = pos {
@@ -92,7 +88,7 @@ impl ArtistDetailsWidget {
) where
F: Fn(String) + Clone + 'static,
{
- self.widget()
+ self.imp()
.artist_releases
.bind_model(Some(store.unsafe_store()), move |item| {
let item = item.downcast_ref::().unwrap();
@@ -127,7 +123,7 @@ impl ArtistDetails {
if let Some(store) = model.get_list_store() {
widget.bind_artist_releases(
worker.clone(),
- &*store,
+ &store,
clone!(@weak model => move |id| {
model.open_album(id);
}),
diff --git a/src/app/components/details/album_header.css b/src/app/components/details/album_header.css
index 4b209498..8bbf5924 100644
--- a/src/app/components/details/album_header.css
+++ b/src/app/components/details/album_header.css
@@ -1,15 +1,11 @@
-.album__header .title-4 label, .header__mobile .title-4 label {
+.album__header .title-4 label {
color: @window_fg_color;
font-weight: bold;
text-decoration: none;
}
-.album__header .title-4, .header__mobile .title-4 {
- padding: 0;
-}
-
-.album__header .title-4:hover, .header__mobile .title-4:hover {
+.album__header .title-4:hover {
border-radius: 6px;
background-image: image(alpha(currentColor, 0.08));
}
@@ -28,16 +24,13 @@
margin-bottom: 6px;
}
-.header__mobile .card {
- margin-top: 12px;
-}
+
clamp.details__clamp {
background-color: @view_bg_color;
box-shadow: inset 0px -1px 0px @borders;
}
headerbar.details__headerbar {
- box-shadow: none;
transition: background-color .3s ease;
}
@@ -52,5 +45,4 @@ headerbar.details__headerbar windowtitle {
.details__headerbar.flat {
background-color: @view_bg_color;
-}
-
+}
\ No newline at end of file
diff --git a/src/app/components/details/album_header.rs b/src/app/components/details/album_header.rs
index cf74daf4..f4bbb606 100644
--- a/src/app/components/details/album_header.rs
+++ b/src/app/components/details/album_header.rs
@@ -42,7 +42,7 @@ mod imp {
type ParentType = gtk::Box;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -62,39 +62,35 @@ glib::wrapper! {
impl AlbumHeaderWidget {
pub fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create an instance of AlbumHeaderWidget")
- }
-
- pub fn widget(&self) -> &imp::AlbumHeaderWidget {
- imp::AlbumHeaderWidget::from_instance(self)
+ glib::Object::new()
}
pub fn connect_liked(&self, f: F)
where
F: Fn() + 'static,
{
- self.widget().like_button.connect_clicked(move |_| f());
+ self.imp().like_button.connect_clicked(move |_| f());
}
pub fn connect_info(&self, f: F)
where
F: Fn() + 'static,
{
- self.widget().info_button.connect_clicked(move |_| f());
+ self.imp().info_button.connect_clicked(move |_| f());
}
pub fn connect_artist_clicked(&self, f: F)
where
F: Fn() + 'static,
{
- self.widget().artist_button.connect_activate_link(move |_| {
+ self.imp().artist_button.connect_activate_link(move |_| {
f();
glib::signal::Inhibit(true)
});
}
pub fn set_liked(&self, is_liked: bool) {
- self.widget().like_button.set_icon_name(if is_liked {
+ self.imp().like_button.set_icon_name(if is_liked {
"starred-symbolic"
} else {
"non-starred-symbolic"
@@ -102,11 +98,11 @@ impl AlbumHeaderWidget {
}
pub fn set_artwork(&self, art: &gdk_pixbuf::Pixbuf) {
- self.widget().album_art.set_from_pixbuf(Some(art));
+ self.imp().album_art.set_from_pixbuf(Some(art));
}
pub fn set_album_and_artist_and_year(&self, album: &str, artist: &str, year: Option) {
- let widget = self.widget();
+ let widget = self.imp();
widget.album_label.set_label(album);
widget.artist_button_label.set_label(artist);
match year {
@@ -116,15 +112,10 @@ impl AlbumHeaderWidget {
}
pub fn set_centered(&self) {
- let widget = self.widget();
+ let widget = self.imp();
widget.album_label.set_halign(gtk::Align::Center);
widget.album_label.set_justify(gtk::Justification::Center);
widget.artist_button.set_halign(gtk::Align::Center);
widget.year_label.set_halign(gtk::Align::Center);
}
-
- pub fn hide_actions(&self) {
- self.widget().like_button.set_visible(false);
- self.widget().info_button.set_visible(false);
- }
}
diff --git a/src/app/components/details/album_header.ui b/src/app/components/details/album_header.ui
index b23f3f9c..e246ea41 100644
--- a/src/app/components/details/album_header.ui
+++ b/src/app/components/details/album_header.ui
@@ -10,8 +10,8 @@
6
@@ -45,7 +45,7 @@
1centervertical
- 6
+ 6
@@ -107,5 +107,8 @@
+
-
+
\ No newline at end of file
diff --git a/src/app/components/details/details.rs b/src/app/components/details/details.rs
index fcb36c33..46fe19b1 100644
--- a/src/app/components/details/details.rs
+++ b/src/app/components/details/details.rs
@@ -8,7 +8,7 @@ use super::release_details::ReleaseDetailsWindow;
use super::DetailsModel;
use crate::app::components::{
- Component, EventListener, HeaderBarComponent, HeaderBarWidget, Playlist,
+ Component, EventListener, HeaderBarComponent, HeaderBarWidget, Playlist, ScrollingHeaderWidget,
};
use crate::app::dispatch::Worker;
use crate::app::loader::ImageLoader;
@@ -24,14 +24,11 @@ mod imp {
#[template(resource = "/dev/alextren/Spot/components/details.ui")]
pub struct AlbumDetailsWidget {
#[template_child]
- pub scrolled_window: TemplateChild,
+ pub scrolling_header: TemplateChild,
#[template_child]
pub headerbar: TemplateChild,
- #[template_child]
- pub header_revealer: TemplateChild,
-
#[template_child]
pub header_widget: TemplateChild,
@@ -49,7 +46,7 @@ mod imp {
type ParentType = libadwaita::Bin;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -58,8 +55,8 @@ mod imp {
}
impl ObjectImpl for AlbumDetailsWidget {
- fn constructed(&self, obj: &Self::Type) {
- self.parent_constructed(obj);
+ fn constructed(&self) {
+ self.parent_constructed();
self.header_mobile.set_centered();
self.headerbar.add_classes(&["details__headerbar"]);
}
@@ -75,77 +72,45 @@ glib::wrapper! {
impl AlbumDetailsWidget {
fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create an instance of AlbumDetailsWidget")
- }
-
- fn widget(&self) -> &imp::AlbumDetailsWidget {
- imp::AlbumDetailsWidget::from_instance(self)
+ glib::Object::new()
}
- fn set_header_visible(&self, visible: bool) -> bool {
- let widget = self.widget();
- let is_up_to_date = widget.header_revealer.reveals_child() == visible;
- if !is_up_to_date {
- widget.header_revealer.set_reveal_child(visible);
- widget.headerbar.set_title_visible(true);
- if visible {
- widget.headerbar.add_classes(&["flat"]);
- } else {
- widget.headerbar.remove_classes(&["flat"]);
- }
+ fn set_header_visible(&self, visible: bool) {
+ let widget = self.imp();
+ widget.headerbar.set_title_visible(true);
+ if visible {
+ widget.headerbar.add_classes(&["flat"]);
+ } else {
+ widget.headerbar.remove_classes(&["flat"]);
}
- is_up_to_date
}
- fn connect_header_visibility(&self) {
- self.set_header_visible(true);
-
- let scroll_controller =
- gtk::EventControllerScroll::new(gtk::EventControllerScrollFlags::VERTICAL);
- scroll_controller.connect_scroll(
- clone!(@weak self as _self => @default-return gtk::Inhibit(false), move |_, _, dy| {
- let visible = dy < 0f64;
- gtk::Inhibit(!_self.set_header_visible(visible))
+ fn connect_header(&self) {
+ self.set_header_visible(false);
+ self.imp().scrolling_header.connect_header_visibility(
+ clone!(@weak self as _self => move |visible| {
+ _self.set_header_visible(visible);
}),
);
-
- let swipe_controller = gtk::GestureSwipe::new();
- swipe_controller.set_touch_only(true);
- swipe_controller.set_propagation_phase(gtk::PropagationPhase::Capture);
- swipe_controller.connect_swipe(clone!(@weak self as _self => move |_, _, dy| {
- let visible = dy >= 0f64;
- _self.set_header_visible(visible);
- }));
-
- self.widget()
- .scrolled_window
- .add_controller(&scroll_controller);
- self.add_controller(&swipe_controller);
}
fn connect_bottom_edge(&self, f: F)
where
F: Fn() + 'static,
{
- self.widget()
- .scrolled_window
- .connect_edge_reached(move |_, pos| {
- if let gtk::PositionType::Bottom = pos {
- f()
- }
- });
+ self.imp().scrolling_header.connect_bottom_edge(f);
}
fn headerbar_widget(&self) -> &HeaderBarWidget {
- self.widget().headerbar.as_ref()
+ self.imp().headerbar.as_ref()
}
fn album_tracks_widget(&self) -> >k::ListView {
- self.widget().album_tracks.as_ref()
+ self.imp().album_tracks.as_ref()
}
fn set_loaded(&self) {
- let context = self.style_context();
+ let context = self.imp().scrolling_header.style_context();
context.add_class("container--loaded");
}
@@ -153,48 +118,44 @@ impl AlbumDetailsWidget {
where
F: Fn() + Clone + 'static,
{
- self.widget().header_widget.connect_liked(f.clone());
- self.widget().header_mobile.connect_liked(f);
+ self.imp().header_widget.connect_liked(f.clone());
+ self.imp().header_mobile.connect_liked(f);
}
fn connect_info(&self, f: F)
where
F: Fn() + Clone + 'static,
{
- self.widget().header_widget.connect_info(f.clone());
- self.widget().header_mobile.connect_info(f);
+ self.imp().header_widget.connect_info(f.clone());
+ self.imp().header_mobile.connect_info(f);
}
fn set_liked(&self, is_liked: bool) {
- self.widget().header_widget.set_liked(is_liked);
- self.widget().header_mobile.set_liked(is_liked);
+ self.imp().header_widget.set_liked(is_liked);
+ self.imp().header_mobile.set_liked(is_liked);
}
fn set_album_and_artist_and_year(&self, album: &str, artist: &str, year: Option) {
- self.widget()
+ self.imp()
.header_widget
.set_album_and_artist_and_year(album, artist, year);
- self.widget()
+ self.imp()
.header_mobile
.set_album_and_artist_and_year(album, artist, year);
- self.widget()
- .headerbar
- .set_title_and_subtitle(album, artist);
+ self.imp().headerbar.set_title_and_subtitle(album, artist);
}
fn set_artwork(&self, art: &gdk_pixbuf::Pixbuf) {
- self.widget().header_widget.set_artwork(art);
- self.widget().header_mobile.set_artwork(art);
+ self.imp().header_widget.set_artwork(art);
+ self.imp().header_mobile.set_artwork(art);
}
fn connect_artist_clicked(&self, f: F)
where
F: Fn() + Clone + 'static,
{
- self.widget()
- .header_widget
- .connect_artist_clicked(f.clone());
- self.widget().header_mobile.connect_artist_clicked(f);
+ self.imp().header_widget.connect_artist_clicked(f.clone());
+ self.imp().header_mobile.connect_artist_clicked(f);
}
}
@@ -231,7 +192,7 @@ impl Details {
widget.connect_liked(clone!(@weak model => move || model.toggle_save_album()));
- widget.connect_header_visibility();
+ widget.connect_header();
widget.connect_bottom_edge(clone!(@weak model => move || {
model.load_more();
diff --git a/src/app/components/details/details.ui b/src/app/components/details/details.ui
index 02e92dad..55e1d491 100644
--- a/src/app/components/details/details.ui
+++ b/src/app/components/details/details.ui
@@ -12,13 +12,12 @@
-
-
-
+
\ No newline at end of file
diff --git a/src/app/components/details/mod.rs b/src/app/components/details/mod.rs
index ae36dd5a..5c7f36ef 100644
--- a/src/app/components/details/mod.rs
+++ b/src/app/components/details/mod.rs
@@ -1,8 +1,7 @@
mod album_header;
mod details;
mod details_model;
+mod release_details;
-pub use album_header::AlbumHeaderWidget;
pub use details::Details;
pub use details_model::DetailsModel;
-mod release_details;
diff --git a/src/app/components/details/release_details.rs b/src/app/components/details/release_details.rs
index 4226a433..ee54aea0 100644
--- a/src/app/components/details/release_details.rs
+++ b/src/app/components/details/release_details.rs
@@ -1,4 +1,3 @@
-use gtk::prelude::*;
use gtk::subclass::prelude::*;
use gtk::CompositeTemplate;
use libadwaita::subclass::prelude::*;
@@ -35,7 +34,7 @@ mod imp {
type ParentType = libadwaita::Window;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -44,8 +43,8 @@ mod imp {
}
impl ObjectImpl for ReleaseDetailsWindow {
- fn constructed(&self, obj: &Self::Type) {
- self.parent_constructed(obj);
+ fn constructed(&self) {
+ self.parent_constructed();
}
}
@@ -60,11 +59,7 @@ glib::wrapper! {
impl ReleaseDetailsWindow {
pub fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create an instance of ReleaseDetailsWindow")
- }
-
- fn widget(&self) -> &imp::ReleaseDetailsWindow {
- imp::ReleaseDetailsWindow::from_instance(self)
+ glib::Object::new()
}
#[allow(clippy::too_many_arguments)]
@@ -77,7 +72,7 @@ impl ReleaseDetailsWindow {
track_count: usize,
copyright: &str,
) {
- let widget = self.widget();
+ let widget = self.imp();
widget
.album_artist
diff --git a/src/app/components/headerbar/widget.rs b/src/app/components/headerbar/widget.rs
index 2b90a0b6..7ce34197 100644
--- a/src/app/components/headerbar/widget.rs
+++ b/src/app/components/headerbar/widget.rs
@@ -48,7 +48,7 @@ mod imp {
type Interfaces = (gtk::Buildable,);
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -59,15 +59,9 @@ mod imp {
impl ObjectImpl for HeaderBarWidget {}
impl BuildableImpl for HeaderBarWidget {
- fn add_child(
- &self,
- buildable: &Self::Type,
- builder: >k::Builder,
- child: &glib::Object,
- type_: Option<&str>,
- ) {
+ fn add_child(&self, builder: >k::Builder, child: &glib::Object, type_: Option<&str>) {
if Some("root") == type_ {
- self.parent_add_child(buildable, builder, child, type_);
+ self.parent_add_child(builder, child, type_);
} else {
self.main_header
.set_title_widget(child.downcast_ref::());
@@ -86,46 +80,42 @@ glib::wrapper! {
impl HeaderBarWidget {
pub fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create an instance of HeaderBarWidget")
- }
-
- fn widget(&self) -> &imp::HeaderBarWidget {
- imp::HeaderBarWidget::from_instance(self)
+ glib::Object::new()
}
pub fn connect_selection_start(&self, f: F)
where
F: Fn() + 'static,
{
- self.widget().start_selection.connect_clicked(move |_| f());
+ self.imp().start_selection.connect_clicked(move |_| f());
}
pub fn connect_select_all(&self, f: F)
where
F: Fn() + 'static,
{
- self.widget().select_all.connect_clicked(move |_| f());
+ self.imp().select_all.connect_clicked(move |_| f());
}
pub fn connect_selection_cancel(&self, f: F)
where
F: Fn() + 'static,
{
- self.widget().cancel.connect_clicked(move |_| f());
+ self.imp().cancel.connect_clicked(move |_| f());
}
pub fn connect_go_back(&self, f: F)
where
F: Fn() + 'static,
{
- self.widget().go_back.connect_clicked(move |_| f());
+ self.imp().go_back.connect_clicked(move |_| f());
}
pub fn bind_to_leaflet(&self, leaflet: &libadwaita::Leaflet) {
leaflet
.bind_property(
"folded",
- &*self.widget().main_header,
+ &*self.imp().main_header,
"show-start-title-buttons",
)
.build();
@@ -133,63 +123,63 @@ impl HeaderBarWidget {
}
pub fn set_can_go_back(&self, can_go_back: bool) {
- self.widget().go_back.set_visible(can_go_back);
+ self.imp().go_back.set_visible(can_go_back);
}
pub fn set_selection_possible(&self, possible: bool) {
- self.widget().start_selection.set_visible(possible);
+ self.imp().start_selection.set_visible(possible);
}
pub fn set_select_all_possible(&self, possible: bool) {
- self.widget().select_all.set_visible(possible);
+ self.imp().select_all.set_visible(possible);
}
pub fn set_selection_active(&self, active: bool) {
if active {
- self.widget()
+ self.imp()
.selection_title
.set_title(&labels::n_songs_selected_label(0));
- self.widget().selection_title.show();
- self.widget().selection_header.show();
+ self.imp().selection_title.show();
+ self.imp().selection_header.show();
} else {
- self.widget().selection_title.hide();
- self.widget().selection_header.hide();
+ self.imp().selection_title.hide();
+ self.imp().selection_header.hide();
}
}
pub fn set_selection_count(&self, count: usize) {
- self.widget()
+ self.imp()
.selection_title
.set_title(&labels::n_songs_selected_label(count));
}
pub fn add_classes(&self, classes: &[&str]) {
- let context = self.widget().main_header.style_context();
+ let context = self.imp().main_header.style_context();
for &class in classes {
context.add_class(class);
}
}
pub fn remove_classes(&self, classes: &[&str]) {
- let context = self.widget().main_header.style_context();
+ let context = self.imp().main_header.style_context();
for &class in classes {
context.remove_class(class);
}
}
pub fn set_title_visible(&self, visible: bool) {
- self.widget().title.set_visible(visible);
+ self.imp().title.set_visible(visible);
}
pub fn set_title_and_subtitle(&self, title: &str, subtitle: &str) {
- self.widget().title.set_title(title);
- self.widget().title.set_subtitle(subtitle);
+ self.imp().title.set_title(title);
+ self.imp().title.set_subtitle(subtitle);
}
pub fn set_title(&self, title: Option<&str>) {
- self.widget().title.set_visible(title.is_some());
+ self.imp().title.set_visible(title.is_some());
if let Some(title) = title {
- self.widget().title.set_title(title);
+ self.imp().title.set_title(title);
}
}
}
diff --git a/src/app/components/library/library.rs b/src/app/components/library/library.rs
index cf97f578..74923a54 100644
--- a/src/app/components/library/library.rs
+++ b/src/app/components/library/library.rs
@@ -35,7 +35,7 @@ mod imp {
type ParentType = gtk::Box;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -54,14 +54,14 @@ glib::wrapper! {
impl LibraryWidget {
pub fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create an instance of LibraryWidget")
+ glib::Object::new()
}
fn connect_bottom_edge(&self, f: F)
where
F: Fn() + 'static,
{
- imp::LibraryWidget::from_instance(self)
+ self.imp()
.scrolled_window
.connect_edge_reached(move |_, pos| {
if let gtk::PositionType::Bottom = pos {
@@ -74,9 +74,9 @@ impl LibraryWidget {
where
F: Fn(String) + Clone + 'static,
{
- imp::LibraryWidget::from_instance(self).flowbox.bind_model(
- Some(store.unsafe_store()),
- move |item| {
+ self.imp()
+ .flowbox
+ .bind_model(Some(store.unsafe_store()), move |item| {
wrap_flowbox_item(item, |album_model| {
let f = on_album_pressed.clone();
let album = AlbumWidget::for_model(album_model, worker.clone());
@@ -85,12 +85,11 @@ impl LibraryWidget {
}));
album
})
- },
- );
+ });
}
pub fn status_page(&self) -> &libadwaita::StatusPage {
- &imp::LibraryWidget::from_instance(self).status_page
+ &self.imp().status_page
}
}
@@ -118,7 +117,7 @@ impl Library {
fn bind_flowbox(&self) {
self.widget.bind_albums(
self.worker.clone(),
- &*self.model.get_list_store().unwrap(),
+ &self.model.get_list_store().unwrap(),
clone!(@weak self.model as model => move |id| {
model.open_album(id);
}),
diff --git a/src/app/components/login/login.rs b/src/app/components/login/login.rs
index ae6e4a29..62cc1af3 100644
--- a/src/app/components/login/login.rs
+++ b/src/app/components/login/login.rs
@@ -22,7 +22,7 @@ mod imp {
pub username: TemplateChild,
#[template_child]
- pub password: TemplateChild,
+ pub password: TemplateChild,
#[template_child]
pub close_button: TemplateChild,
@@ -41,7 +41,7 @@ mod imp {
type ParentType = libadwaita::Window;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -61,15 +61,14 @@ glib::wrapper! {
impl LoginWindow {
pub fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create an instance of LoginWindow")
+ glib::Object::new()
}
fn connect_close(&self, on_close: F)
where
F: Fn() + 'static,
{
- let widget = imp::LoginWindow::from_instance(self);
- widget.close_button.connect_clicked(move |_| {
+ self.imp().close_button.connect_clicked(move |_| {
on_close();
});
}
@@ -78,8 +77,6 @@ impl LoginWindow {
where
SubmitFn: Fn(&str, &str) + Clone + 'static,
{
- let widget = imp::LoginWindow::from_instance(self);
-
let on_submit_clone = on_submit.clone();
let controller = gtk::EventControllerKey::new();
controller.set_propagation_phase(gtk::PropagationPhase::Capture);
@@ -93,9 +90,9 @@ impl LoginWindow {
}
}),
);
- self.add_controller(&controller);
+ self.add_controller(controller);
- widget
+ self.imp()
.login_button
.connect_clicked(clone!(@weak self as _self => move |_| {
_self.submit(&on_submit);
@@ -103,7 +100,7 @@ impl LoginWindow {
}
fn show_auth_error(&self, shown: bool) {
- let widget = imp::LoginWindow::from_instance(self);
+ let widget = self.imp();
widget.auth_error_container.set_reveal_child(shown);
}
@@ -111,7 +108,7 @@ impl LoginWindow {
where
SubmitFn: Fn(&str, &str),
{
- let widget = imp::LoginWindow::from_instance(self);
+ let widget = self.imp();
self.show_auth_error(false);
@@ -161,14 +158,6 @@ impl Login {
self.login_window.upcast_ref::()
}
- fn show_self_if_needed(&self) {
- if self.model.try_autologin() {
- self.window().close();
- } else {
- self.show_self();
- }
- }
-
fn show_self(&self) {
self.window().set_transient_for(Some(&self.parent));
self.window().set_modal(true);
@@ -198,9 +187,9 @@ impl EventListener for Login {
self.reveal_error();
}
AppEvent::Started => {
- self.show_self_if_needed();
+ self.model.try_autologin();
}
- AppEvent::LoginEvent(LoginEvent::LogoutCompleted) => {
+ AppEvent::LoginEvent(LoginEvent::LogoutCompleted | LoginEvent::LoginShown) => {
self.show_self();
}
AppEvent::LoginEvent(LoginEvent::RefreshTokenCompleted {
diff --git a/src/app/components/login/login.ui b/src/app/components/login/login.ui
index 9175b67d..c106c229 100644
--- a/src/app/components/login/login.ui
+++ b/src/app/components/login/login.ui
@@ -1,7 +1,7 @@
-
-
+
+ 360100
@@ -24,7 +24,7 @@
22window-close-symbolic
@@ -38,11 +38,15 @@
1vertical20
+ 20
+ 16
+ 16
@@ -69,7 +73,9 @@
@@ -84,10 +90,12 @@
-
+
@@ -111,7 +119,8 @@
@@ -142,4 +151,4 @@
-
+
\ No newline at end of file
diff --git a/src/app/components/login/login_model.rs b/src/app/components/login/login_model.rs
index cd3e73a9..033468f4 100644
--- a/src/app/components/login/login_model.rs
+++ b/src/app/components/login/login_model.rs
@@ -4,58 +4,70 @@ use gettextrs::*;
use crate::app::credentials::Credentials;
use crate::app::state::{LoginAction, TryLoginAction};
-use crate::app::{ActionDispatcher, AppAction};
+use crate::app::{ActionDispatcher, AppAction, Worker};
pub struct LoginModel {
dispatcher: Box,
+ worker: Worker,
}
impl LoginModel {
- pub fn new(dispatcher: Box) -> Self {
- Self { dispatcher }
+ pub fn new(dispatcher: Box, worker: Worker) -> Self {
+ Self { dispatcher, worker }
}
- pub fn try_autologin(&self) -> bool {
- if let Ok(creds) = Credentials::retrieve() {
- let try_login_action = if creds.token_expired() {
- TryLoginAction::Password {
- username: creds.username,
- password: creds.password,
- }
- } else {
- TryLoginAction::Token {
- username: creds.username,
- token: creds.token,
+ pub fn try_autologin(&self) {
+ self.dispatcher.dispatch_async(Box::pin(async {
+ let action = match Credentials::retrieve().await {
+ Ok(creds) => LoginAction::TryLogin(if creds.token_expired() {
+ TryLoginAction::Password {
+ username: creds.username,
+ password: creds.password,
+ }
+ } else {
+ TryLoginAction::Token {
+ username: creds.username,
+ token: creds.token,
+ }
+ }),
+ Err(err) => {
+ warn!("Could not retrieve credentials: {}", err);
+ LoginAction::ShowLogin
}
};
- self.dispatcher
- .dispatch(LoginAction::TryLogin(try_login_action).into());
- true
- } else {
- false
- }
+ Some(action.into())
+ }));
}
pub fn clear_saved_credentials(&self) {
- let _ = Credentials::logout();
+ self.worker.send_task(async {
+ let _ = Credentials::logout().await;
+ });
}
pub fn save_token(&self, token: String, token_expiry_time: SystemTime) {
- if let Ok(mut credentials) = Credentials::retrieve() {
- credentials.token = token;
- credentials.token_expiry_time = Some(token_expiry_time);
- self.save_for_autologin(credentials);
- }
+ self.worker.send_task(async move {
+ if let Ok(mut credentials) = Credentials::retrieve().await {
+ credentials.token = token;
+ credentials.token_expiry_time = Some(token_expiry_time);
+ if let Err(err) = credentials.save().await {
+ warn!("Could not save credentials: {}", err);
+ }
+ }
+ });
}
pub fn save_for_autologin(&self, credentials: Credentials) {
- if credentials.save().is_err() {
- self.dispatcher
- .dispatch(AppAction::ShowNotification(gettext(
- // translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
- "Could not save password. Make sure the session keyring is unlocked.",
- )));
- }
+ self.dispatcher.dispatch_async(Box::pin(async move {
+ let Err(err) = credentials.save().await else {
+ return None;
+ };
+ warn!("Could not save credentials: {}", err);
+ Some(AppAction::ShowNotification(gettext(
+ // translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
+ "Could not save password. Make sure the session keyring is unlocked.",
+ )))
+ }));
}
pub fn login(&self, username: String, password: String) {
diff --git a/src/app/components/mod.rs b/src/app/components/mod.rs
index 86d4809e..148425e9 100644
--- a/src/app/components/mod.rs
+++ b/src/app/components/mod.rs
@@ -79,15 +79,21 @@ pub use selection::*;
mod headerbar;
pub use headerbar::*;
+mod scrolling_header;
+pub use scrolling_header::*;
+
pub mod utils;
pub mod labels;
-pub mod sidebar_listbox;
+
+pub mod sidebar;
pub fn expose_widgets() {
playback::expose_widgets();
selection::expose_widgets();
headerbar::expose_widgets();
+ playlist_details::expose_widgets();
+ scrolling_header::expose_widgets();
}
impl dyn ActionDispatcher {
@@ -112,7 +118,7 @@ impl dyn ActionDispatcher {
Err(SpotifyApiError::NoToken) => vec![],
Err(SpotifyApiError::InvalidToken) => {
let mut retried = call().await.unwrap_or_else(|_| Vec::new());
- retried.push(LoginAction::RefreshToken.into());
+ retried.insert(0, LoginAction::RefreshToken.into());
retried
}
Err(err) => {
diff --git a/src/app/components/navigation/factory.rs b/src/app/components/navigation/factory.rs
index 7d7cbc7b..d8f6564f 100644
--- a/src/app/components/navigation/factory.rs
+++ b/src/app/components/navigation/factory.rs
@@ -1,5 +1,6 @@
use std::rc::Rc;
+use crate::app::components::sidebar::{Sidebar, SidebarModel};
use crate::app::components::*;
use crate::app::state::SelectionContext;
use crate::app::{ActionDispatcher, AppModel, Worker};
@@ -41,12 +42,14 @@ impl ScreenFactory {
)
}
- pub fn make_saved_playlists_model(&self) -> SavedPlaylistsModel {
- SavedPlaylistsModel::new(Rc::clone(&self.app_model), self.dispatcher.box_clone())
+ pub fn make_sidebar(&self, listbox: gtk::ListBox) -> impl ListenerComponent {
+ let model = SidebarModel::new(Rc::clone(&self.app_model), self.dispatcher.box_clone());
+ Sidebar::new(listbox, Rc::new(model))
}
pub fn make_saved_playlists(&self) -> impl ListenerComponent {
- let model = self.make_saved_playlists_model();
+ let model =
+ SavedPlaylistsModel::new(Rc::clone(&self.app_model), self.dispatcher.box_clone());
let screen_model = DefaultHeaderBarModel::new(
Some(gettext("Playlists")),
None,
@@ -134,16 +137,7 @@ impl ScreenFactory {
Rc::clone(&self.app_model),
self.dispatcher.box_clone(),
));
- let screen_model = SimpleHeaderBarModelWrapper::new(
- Rc::clone(&model),
- Rc::clone(&self.app_model),
- self.dispatcher.box_clone(),
- );
- StandardScreen::new(
- PlaylistDetails::new(model, self.worker.clone()),
- &self.leaflet,
- Rc::new(screen_model),
- )
+ PlaylistDetails::new(model, self.worker.clone())
}
pub fn make_user_details(&self, id: String) -> impl ListenerComponent {
diff --git a/src/app/components/navigation/home.rs b/src/app/components/navigation/home.rs
index 313404e2..1c2e62f3 100644
--- a/src/app/components/navigation/home.rs
+++ b/src/app/components/navigation/home.rs
@@ -1,153 +1,64 @@
-use gettextrs::*;
use gtk::prelude::*;
-use crate::app::components::sidebar_listbox::{SideBarItem, SideBarRow};
-use crate::app::components::{Component, EventListener, SavedPlaylistsModel, ScreenFactory};
-use crate::app::models::AlbumModel;
+use crate::app::components::sidebar::SidebarDestination;
+use crate::app::components::{Component, EventListener, ScreenFactory};
use crate::app::{AppEvent, BrowserEvent};
-const LIBRARY: &str = "library";
-const SAVED_TRACKS: &str = "saved_tracks";
-const NOW_PLAYING: &str = "now_playing";
-const SAVED_PLAYLISTS: &str = "saved_playlists";
-const NUM_FIXED_ENTRIES: u32 = 5;
-const NUM_PLAYLISTS: usize = 20;
-
-fn add_to_stack_and_listbox(
- stack: >k::Stack,
- list_store: &gio::ListStore,
- widget: >k::Widget,
- name: &str,
- title: &str,
- icon_name: &str,
- grayed_out: bool,
-) {
- stack.add_titled(widget, Option::from(name), title);
- list_store.append(&SideBarItem::new(name, title, icon_name, grayed_out))
-}
-
-fn make_playlist_item(playlist_item: AlbumModel) -> SideBarItem {
- let mut title = playlist_item.album_title();
- if title.is_empty() {
- title = gettext("Unnamed playlist");
- }
-
- let id = playlist_item.uri();
-
- SideBarItem::new(id.as_str(), &title, "playlist2-symbolic", false)
-}
-
pub struct HomePane {
stack: gtk::Stack,
- listbox: gtk::ListBox,
- list_store: gio::ListStore,
components: Vec>,
- saved_playlists_model: SavedPlaylistsModel,
}
impl HomePane {
- pub fn new(
- listbox: gtk::ListBox,
- screen_factory: &ScreenFactory,
- list_store: gio::ListStore,
- ) -> Self {
+ pub fn new(listbox: gtk::ListBox, screen_factory: &ScreenFactory) -> Self {
let library = screen_factory.make_library();
let saved_playlists = screen_factory.make_saved_playlists();
let saved_tracks = screen_factory.make_saved_tracks();
let now_playing = screen_factory.make_now_playing();
+ let sidebar = screen_factory.make_sidebar(listbox);
- let saved_playlists_model = screen_factory.make_saved_playlists_model();
let stack = gtk::Stack::new();
stack.set_transition_type(gtk::StackTransitionType::Crossfade);
- add_to_stack_and_listbox(
- &stack,
- &list_store,
+
+ let dest = SidebarDestination::Library;
+ stack.add_titled(
library.get_root_widget(),
- LIBRARY,
- // translators: This is a sidebar entry to browse to saved albums.
- &gettext("Library"),
- "library-music-symbolic",
- false,
+ Option::from(dest.id()),
+ &dest.title(),
);
- add_to_stack_and_listbox(
- &stack,
- &list_store,
+
+ let dest = SidebarDestination::SavedTracks;
+ stack.add_titled(
saved_tracks.get_root_widget(),
- SAVED_TRACKS,
- // translators: This is a sidebar entry to browse to saved tracks.
- &gettext("Saved tracks"),
- "starred-symbolic",
- false,
+ Option::from(dest.id()),
+ &dest.title(),
);
- add_to_stack_and_listbox(
- &stack,
- &list_store,
- now_playing.get_root_widget(),
- NOW_PLAYING,
- &gettext("Now playing"),
- "music-queue-symbolic",
- false,
- );
- list_store.append(&SideBarItem::new(
- SAVED_PLAYLISTS,
- // translators: This is a sidebar entry that marks that the entries below are playlists.
- &gettext("Playlists"),
- "",
- true,
- ));
- add_to_stack_and_listbox(
- &stack,
- &list_store,
+
+ let dest = SidebarDestination::SavedPlaylists;
+ stack.add_titled(
saved_playlists.get_root_widget(),
- SAVED_PLAYLISTS,
- // translators: This is a sidebar entry to browse to saved playlists.
- &gettext("All Playlists"),
- "view-app-grid-symbolic",
- false,
+ Option::from(dest.id()),
+ &dest.title(),
+ );
+
+ let dest = SidebarDestination::NowPlaying;
+ stack.add_titled(
+ now_playing.get_root_widget(),
+ Option::from(dest.id()),
+ &dest.title(),
);
Self {
stack,
- listbox,
- list_store,
components: vec![
+ Box::new(sidebar),
Box::new(library),
Box::new(saved_playlists),
Box::new(saved_tracks),
Box::new(now_playing),
],
- saved_playlists_model,
}
}
-
- pub fn connect_navigated(&self, f: F) {
- let model = self.saved_playlists_model.clone();
- self.listbox
- .connect_row_activated(clone!(@weak self.stack as stack => move |_, row| {
- let id = row.downcast_ref::().unwrap().id();
- match id.as_str() {
- LIBRARY | SAVED_TRACKS | NOW_PLAYING | SAVED_PLAYLISTS => {
- stack.set_visible_child_name(&id);
- f();
- },
- _ => model.open_playlist(id),
- }
- }));
- }
-
- fn update_playlists_in_sidebar(&mut self) {
- let playlists = self.saved_playlists_model.get_playlists();
- let vec: Vec = playlists
- .iter()
- .take(NUM_PLAYLISTS)
- .map(make_playlist_item)
- .collect();
- self.list_store.splice(
- NUM_FIXED_ENTRIES,
- self.list_store.n_items() - NUM_FIXED_ENTRIES,
- vec.as_slice(),
- );
- }
}
impl Component for HomePane {
@@ -164,10 +75,11 @@ impl EventListener for HomePane {
fn on_event(&mut self, event: &AppEvent) {
match event {
AppEvent::NowPlayingShown => {
- self.stack.set_visible_child_name("now_playing");
+ self.stack
+ .set_visible_child_name(SidebarDestination::NowPlaying.id());
}
- AppEvent::BrowserEvent(BrowserEvent::SavedPlaylistsUpdated) => {
- self.update_playlists_in_sidebar();
+ AppEvent::BrowserEvent(BrowserEvent::HomeVisiblePageChanged(page)) => {
+ self.stack.set_visible_child_name(page);
}
_ => {}
}
diff --git a/src/app/components/navigation/navigation.rs b/src/app/components/navigation/navigation.rs
index 44b95d5f..879350c5 100644
--- a/src/app/components/navigation/navigation.rs
+++ b/src/app/components/navigation/navigation.rs
@@ -13,7 +13,6 @@ pub struct Navigation {
leaflet: libadwaita::Leaflet,
navigation_stack: gtk::Stack,
home_listbox: gtk::ListBox,
- home_list_store: gio::ListStore,
screen_factory: ScreenFactory,
children: Vec>,
}
@@ -24,7 +23,6 @@ impl Navigation {
leaflet: libadwaita::Leaflet,
navigation_stack: gtk::Stack,
home_listbox: gtk::ListBox,
- home_list_store: gio::ListStore,
screen_factory: ScreenFactory,
) -> Self {
let model = Rc::new(model);
@@ -50,33 +48,27 @@ impl Navigation {
leaflet,
navigation_stack,
home_listbox,
- home_list_store,
screen_factory,
children: vec![],
}
}
fn make_home(&self) -> Box {
- let home = HomePane::new(
+ Box::new(HomePane::new(
self.home_listbox.clone(),
&self.screen_factory,
- self.home_list_store.clone(),
- );
-
- home.connect_navigated(
- clone!(@weak self.model as model, @weak self.leaflet as leaflet => move || {
- leaflet.navigate(NavigationDirection::Forward);
- model.go_home();
- }),
- );
-
- Box::new(home)
+ ))
}
fn show_navigation(&self) {
self.leaflet.navigate(NavigationDirection::Back);
}
+ fn pop_to_home(&mut self) {
+ self.leaflet.navigate(NavigationDirection::Forward);
+ self.pop_to(&ScreenName::Home);
+ }
+
fn push_screen(&mut self, name: &ScreenName) {
let component: Box = match name {
ScreenName::Home => self.make_home(),
@@ -148,6 +140,9 @@ impl EventListener for Navigation {
AppEvent::BrowserEvent(BrowserEvent::NavigationPoppedTo(name)) => {
self.pop_to(name);
}
+ AppEvent::BrowserEvent(BrowserEvent::HomeVisiblePageChanged(_)) => {
+ self.pop_to_home();
+ }
_ => {}
};
for child in self.children.iter_mut() {
diff --git a/src/app/components/navigation/navigation_model.rs b/src/app/components/navigation/navigation_model.rs
index 761327a5..0051787d 100644
--- a/src/app/components/navigation/navigation_model.rs
+++ b/src/app/components/navigation/navigation_model.rs
@@ -16,11 +16,6 @@ impl NavigationModel {
}
}
- pub fn go_home(&self) {
- self.dispatcher
- .dispatch(BrowserAction::NavigationPopTo(ScreenName::Home).into())
- }
-
pub fn visible_child_name(&self) -> impl Deref + '_ {
self.app_model.map_state(|s| s.browser.current_screen())
}
diff --git a/src/app/components/notification/mod.rs b/src/app/components/notification/mod.rs
index becb9848..a0f67bb2 100644
--- a/src/app/components/notification/mod.rs
+++ b/src/app/components/notification/mod.rs
@@ -1,5 +1,7 @@
use crate::app::components::EventListener;
use crate::app::AppEvent;
+use gettextrs::*;
+use glib::ToVariant;
pub struct Notification {
toast_overlay: libadwaita::ToastOverlay,
@@ -15,7 +17,22 @@ impl Notification {
.title(content)
.timeout(4)
.build();
- self.toast_overlay.add_toast(&toast);
+ self.toast_overlay.add_toast(toast);
+ }
+
+ fn show_playlist_created(&self, id: &str) {
+ // translators: This is a notification that pop ups when a new playlist is created. It includes the name of that playlist.
+ let message = gettext("New playlist created.");
+ // translators: This is a label in the notification shown after creating a new playlist. If it is clicked, the new playlist will be opened.
+ let label = gettext("View");
+ let toast = libadwaita::Toast::builder()
+ .title(message)
+ .timeout(4)
+ .action_name("app.open_playlist")
+ .button_label(label)
+ .action_target(&id.to_variant())
+ .build();
+ self.toast_overlay.add_toast(toast);
}
}
@@ -23,6 +40,8 @@ impl EventListener for Notification {
fn on_event(&mut self, event: &AppEvent) {
if let AppEvent::NotificationShown(content) = event {
self.show(content)
+ } else if let AppEvent::PlaylistCreatedNotificationShown(id) = event {
+ self.show_playlist_created(id)
}
}
}
diff --git a/src/app/components/now_playing/now_playing.rs b/src/app/components/now_playing/now_playing.rs
index 17f119da..c487983e 100644
--- a/src/app/components/now_playing/now_playing.rs
+++ b/src/app/components/now_playing/now_playing.rs
@@ -29,7 +29,7 @@ mod imp {
type ParentType = libadwaita::Bin;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -48,14 +48,14 @@ glib::wrapper! {
impl NowPlayingWidget {
fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create an instance of NowPlayingWidget")
+ glib::Object::new()
}
fn connect_bottom_edge(&self, f: F)
where
F: Fn() + 'static,
{
- imp::NowPlayingWidget::from_instance(self)
+ self.imp()
.scrolled_window
.connect_edge_reached(move |_, pos| {
if let gtk::PositionType::Bottom = pos {
@@ -65,9 +65,7 @@ impl NowPlayingWidget {
}
fn song_list_widget(&self) -> >k::ListView {
- imp::NowPlayingWidget::from_instance(self)
- .song_list
- .as_ref()
+ self.imp().song_list.as_ref()
}
}
diff --git a/src/app/components/playback/playback_controls.rs b/src/app/components/playback/playback_controls.rs
index 6038f99a..613626bc 100644
--- a/src/app/components/playback/playback_controls.rs
+++ b/src/app/components/playback/playback_controls.rs
@@ -35,7 +35,7 @@ mod imp {
type ParentType = gtk::Box;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -67,16 +67,13 @@ impl PlaybackControlsWidget {
};
let tooltip_text = Some(translated_tooltip.as_str());
- let playback_control = imp::PlaybackControlsWidget::from_instance(self);
-
+ let playback_control = self.imp();
playback_control.play_pause.set_icon_name(playback_icon);
playback_control.play_pause.set_tooltip_text(tooltip_text);
}
pub fn set_shuffled(&self, shuffled: bool) {
- imp::PlaybackControlsWidget::from_instance(self)
- .shuffle
- .set_active(shuffled);
+ self.imp().shuffle.set_active(shuffled);
}
pub fn set_repeat_mode(&self, mode: RepeatMode) {
@@ -86,53 +83,41 @@ impl PlaybackControlsWidget {
RepeatMode::None => "media-playlist-consecutive-symbolic",
};
- imp::PlaybackControlsWidget::from_instance(self)
- .repeat
- .set_icon_name(repeat_mode_icon);
+ self.imp().repeat.set_icon_name(repeat_mode_icon);
}
pub fn connect_play_pause(&self, f: F)
where
F: Fn() + 'static,
{
- imp::PlaybackControlsWidget::from_instance(self)
- .play_pause
- .connect_clicked(move |_| f());
+ self.imp().play_pause.connect_clicked(move |_| f());
}
pub fn connect_prev(&self, f: F)
where
F: Fn() + 'static,
{
- imp::PlaybackControlsWidget::from_instance(self)
- .prev
- .connect_clicked(move |_| f());
+ self.imp().prev.connect_clicked(move |_| f());
}
pub fn connect_next(&self, f: F)
where
F: Fn() + 'static,
{
- imp::PlaybackControlsWidget::from_instance(self)
- .next
- .connect_clicked(move |_| f());
+ self.imp().next.connect_clicked(move |_| f());
}
pub fn connect_shuffle(&self, f: F)
where
F: Fn() + 'static,
{
- imp::PlaybackControlsWidget::from_instance(self)
- .shuffle
- .connect_clicked(move |_| f());
+ self.imp().shuffle.connect_clicked(move |_| f());
}
pub fn connect_repeat(&self, f: F)
where
F: Fn() + 'static,
{
- imp::PlaybackControlsWidget::from_instance(self)
- .repeat
- .connect_clicked(move |_| f());
+ self.imp().repeat.connect_clicked(move |_| f());
}
}
diff --git a/src/app/components/playback/playback_info.rs b/src/app/components/playback/playback_info.rs
index a6d4dff6..f18e8813 100644
--- a/src/app/components/playback/playback_info.rs
+++ b/src/app/components/playback/playback_info.rs
@@ -24,7 +24,7 @@ mod imp {
type ParentType = gtk::Button;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -43,7 +43,7 @@ glib::wrapper! {
impl PlaybackInfoWidget {
pub fn set_title_and_artist(&self, title: &str, artist: &str) {
- let widget = imp::PlaybackInfoWidget::from_instance(self);
+ let widget = self.imp();
let title = glib::markup_escape_text(title);
let artist = glib::markup_escape_text(artist);
let label = format!("{}\n{}", title.as_str(), artist.as_str());
@@ -51,7 +51,7 @@ impl PlaybackInfoWidget {
}
pub fn reset_info(&self) {
- let widget = imp::PlaybackInfoWidget::from_instance(self);
+ let widget = self.imp();
widget
.current_song_info
// translators: Short text displayed instead of a song title when nothing plays
@@ -65,14 +65,10 @@ impl PlaybackInfoWidget {
}
pub fn set_info_visible(&self, visible: bool) {
- imp::PlaybackInfoWidget::from_instance(self)
- .current_song_info
- .set_visible(visible);
+ self.imp().current_song_info.set_visible(visible);
}
pub fn set_artwork(&self, art: &gdk_pixbuf::Pixbuf) {
- imp::PlaybackInfoWidget::from_instance(self)
- .playing_image
- .set_from_pixbuf(Some(art));
+ self.imp().playing_image.set_from_pixbuf(Some(art));
}
}
diff --git a/src/app/components/playback/playback_widget.rs b/src/app/components/playback/playback_widget.rs
index 073b1431..ff2410aa 100644
--- a/src/app/components/playback/playback_widget.rs
+++ b/src/app/components/playback/playback_widget.rs
@@ -49,7 +49,7 @@ mod imp {
type ParentType = gtk::Box;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -58,8 +58,8 @@ mod imp {
}
impl ObjectImpl for PlaybackWidget {
- fn constructed(&self, obj: &Self::Type) {
- self.parent_constructed(obj);
+ fn constructed(&self) {
+ self.parent_constructed();
self.now_playing_mobile.set_info_visible(false);
self.now_playing.set_info_visible(true);
display_add_css_provider(resource!("/components/playback.css"));
@@ -76,19 +76,19 @@ glib::wrapper! {
impl PlaybackWidget {
pub fn set_title_and_artist(&self, title: &str, artist: &str) {
- let widget = imp::PlaybackWidget::from_instance(self);
+ let widget = self.imp();
widget.now_playing.set_title_and_artist(title, artist);
}
pub fn reset_info(&self) {
- let widget = imp::PlaybackWidget::from_instance(self);
+ let widget = self.imp();
widget.now_playing.reset_info();
widget.now_playing_mobile.reset_info();
self.set_song_duration(None);
}
fn set_artwork(&self, image: &gdk_pixbuf::Pixbuf) {
- let widget = imp::PlaybackWidget::from_instance(self);
+ let widget = self.imp();
widget.now_playing.set_artwork(image);
widget.now_playing_mobile.set_artwork(image);
}
@@ -105,7 +105,7 @@ impl PlaybackWidget {
}
pub fn set_song_duration(&self, duration: Option) {
- let widget = imp::PlaybackWidget::from_instance(self);
+ let widget = self.imp();
let class = "seek-bar--active";
let style_context = widget.seek_bar.style_context();
if let Some(duration) = duration {
@@ -127,13 +127,13 @@ impl PlaybackWidget {
}
pub fn set_seek_position(&self, pos: f64) {
- let widget = imp::PlaybackWidget::from_instance(self);
+ let widget = self.imp();
widget.seek_bar.set_value(pos);
widget.track_position.set_text(&format_duration(pos));
}
pub fn increment_seek_position(&self) {
- let value = imp::PlaybackWidget::from_instance(self).seek_bar.value() + 1_000.0;
+ let value = self.imp().seek_bar.value() + 1_000.0;
self.set_seek_position(value);
}
@@ -141,7 +141,7 @@ impl PlaybackWidget {
where
F: Fn() + Clone + 'static,
{
- let widget = imp::PlaybackWidget::from_instance(self);
+ let widget = self.imp();
let f_clone = f.clone();
widget.now_playing.connect_clicked(move |_| f_clone());
widget.now_playing_mobile.connect_clicked(move |_| f());
@@ -152,11 +152,11 @@ impl PlaybackWidget {
Seek: Fn(u32) + Clone + 'static,
{
let debouncer = Debouncer::new();
- let widget = imp::PlaybackWidget::from_instance(self);
+ let widget = self.imp();
widget.seek_bar.set_increments(5_000.0, 10_000.0);
widget.seek_bar.connect_change_value(
clone!(@weak self as _self => @default-return glib::signal::Inhibit(false), move |_, _, requested| {
- imp::PlaybackWidget::from_instance(&_self)
+ _self.imp()
.track_position
.set_text(&format_duration(requested));
let seek = seek.clone();
@@ -167,7 +167,7 @@ impl PlaybackWidget {
}
pub fn set_playing(&self, is_playing: bool) {
- let widget = imp::PlaybackWidget::from_instance(self);
+ let widget = self.imp();
widget.controls.set_playing(is_playing);
widget.controls_mobile.set_playing(is_playing);
if is_playing {
@@ -180,19 +180,19 @@ impl PlaybackWidget {
}
pub fn set_repeat_mode(&self, mode: RepeatMode) {
- let widget = imp::PlaybackWidget::from_instance(self);
+ let widget = self.imp();
widget.controls.set_repeat_mode(mode);
widget.controls_mobile.set_repeat_mode(mode);
}
pub fn set_shuffled(&self, shuffled: bool) {
- let widget = imp::PlaybackWidget::from_instance(self);
+ let widget = self.imp();
widget.controls.set_shuffled(shuffled);
widget.controls_mobile.set_shuffled(shuffled);
}
pub fn set_seekbar_visible(&self, visible: bool) {
- let widget = imp::PlaybackWidget::from_instance(self);
+ let widget = self.imp();
widget.seek_bar.set_visible(visible);
}
@@ -200,7 +200,7 @@ impl PlaybackWidget {
where
F: Fn() + Clone + 'static,
{
- let widget = imp::PlaybackWidget::from_instance(self);
+ let widget = self.imp();
widget.controls.connect_play_pause(f.clone());
widget.controls_mobile.connect_play_pause(f);
}
@@ -209,7 +209,7 @@ impl PlaybackWidget {
where
F: Fn() + Clone + 'static,
{
- let widget = imp::PlaybackWidget::from_instance(self);
+ let widget = self.imp();
widget.controls.connect_prev(f.clone());
widget.controls_mobile.connect_prev(f);
}
@@ -218,7 +218,7 @@ impl PlaybackWidget {
where
F: Fn() + Clone + 'static,
{
- let widget = imp::PlaybackWidget::from_instance(self);
+ let widget = self.imp();
widget.controls.connect_next(f.clone());
widget.controls_mobile.connect_next(f);
}
@@ -227,7 +227,7 @@ impl PlaybackWidget {
where
F: Fn() + Clone + 'static,
{
- let widget = imp::PlaybackWidget::from_instance(self);
+ let widget = self.imp();
widget.controls.connect_shuffle(f.clone());
widget.controls_mobile.connect_shuffle(f);
}
@@ -236,7 +236,7 @@ impl PlaybackWidget {
where
F: Fn() + Clone + 'static,
{
- let widget = imp::PlaybackWidget::from_instance(self);
+ let widget = self.imp();
widget.controls.connect_repeat(f.clone());
widget.controls_mobile.connect_repeat(f);
}
diff --git a/src/app/components/player_notifier.rs b/src/app/components/player_notifier.rs
index e2e5aa35..7b67dbec 100644
--- a/src/app/components/player_notifier.rs
+++ b/src/app/components/player_notifier.rs
@@ -35,6 +35,9 @@ impl EventListener for PlayerNotifier {
AppEvent::PlaybackEvent(PlaybackEvent::TrackChanged(id)) => {
SpotifyId::from_base62(id).ok().map(Command::PlayerLoad)
}
+ AppEvent::PlaybackEvent(PlaybackEvent::Preload(id)) => {
+ SpotifyId::from_base62(id).ok().map(Command::PlayerPreload)
+ }
AppEvent::PlaybackEvent(PlaybackEvent::TrackSeeked(position)) => {
Some(Command::PlayerSeek(*position))
}
diff --git a/src/app/components/playlist/playlist.rs b/src/app/components/playlist/playlist.rs
index 6e7434d2..e6e7a12c 100644
--- a/src/app/components/playlist/playlist.rs
+++ b/src/app/components/playlist/playlist.rs
@@ -73,7 +73,6 @@ pub trait PlaylistModel {
pub struct Playlist {
animator: AnimatorDefault,
listview: gtk::ListView,
- _press_gesture: gtk::GestureLongPress,
model: Rc,
}
@@ -83,7 +82,7 @@ where
{
pub fn new(listview: gtk::ListView, model: Rc, worker: Worker) -> Self {
let list_model = model.song_list_model();
- let selection_model = gtk::NoSelection::new(Some(&list_model));
+ let selection_model = gtk::NoSelection::new(Some(list_model.clone()));
let factory = gtk::SignalListItemFactory::new();
let style_context = listview.style_context();
@@ -129,17 +128,16 @@ where
}));
let press_gesture = gtk::GestureLongPress::new();
- listview.add_controller(&press_gesture);
press_gesture.set_touch_only(false);
press_gesture.set_propagation_phase(gtk::PropagationPhase::Capture);
press_gesture.connect_pressed(clone!(@weak model => move |_, _, _| {
model.enable_selection();
}));
+ listview.add_controller(press_gesture);
Self {
animator: AnimatorDefault::ease_in_out_animator(),
listview,
- _press_gesture: press_gesture,
model,
}
}
diff --git a/src/app/components/playlist/song.rs b/src/app/components/playlist/song.rs
index c37a8f96..bbf19c52 100644
--- a/src/app/components/playlist/song.rs
+++ b/src/app/components/playlist/song.rs
@@ -4,6 +4,8 @@ use crate::app::models::SongModel;
use crate::app::Worker;
use gio::MenuModel;
+use glib::subclass::InitializingObject;
+
use gtk::prelude::*;
use gtk::subclass::prelude::*;
use gtk::CompositeTemplate;
@@ -49,30 +51,18 @@ mod imp {
type ParentType = gtk::Grid;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
- fn instance_init(obj: &glib::subclass::InitializingObject) {
+ fn instance_init(obj: &InitializingObject) {
obj.init_template();
}
}
lazy_static! {
static ref PROPERTIES: [glib::ParamSpec; 2] = [
- glib::ParamSpecBoolean::new(
- "playing",
- "Playing",
- "",
- false,
- glib::ParamFlags::READWRITE
- ),
- glib::ParamSpecBoolean::new(
- "selected",
- "Selected",
- "",
- false,
- glib::ParamFlags::READWRITE,
- ),
+ glib::ParamSpecBoolean::builder("playing").build(),
+ glib::ParamSpecBoolean::builder("selected").build()
];
}
@@ -81,19 +71,13 @@ mod imp {
&*PROPERTIES
}
- fn set_property(
- &self,
- obj: &Self::Type,
- _id: usize,
- value: &glib::Value,
- pspec: &glib::ParamSpec,
- ) {
+ fn set_property(&self, _id: usize, value: &glib::Value, pspec: &glib::ParamSpec) {
match pspec.name() {
"playing" => {
let is_playing = value
.get()
.expect("type conformity checked by `Object::set_property`");
- let context = obj.style_context();
+ let context = self.obj().style_context();
if is_playing {
context.add_class(SONG_CLASS);
} else {
@@ -110,21 +94,21 @@ mod imp {
}
}
- fn property(&self, obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+ fn property(&self, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
match pspec.name() {
- "playing" => obj.style_context().has_class(SONG_CLASS).to_value(),
+ "playing" => self.obj().style_context().has_class(SONG_CLASS).to_value(),
"selected" => self.song_checkbox.is_active().to_value(),
_ => unimplemented!(),
}
}
- fn constructed(&self, obj: &Self::Type) {
- self.parent_constructed(obj);
+ fn constructed(&self) {
+ self.parent_constructed();
self.song_checkbox.set_sensitive(false);
}
- fn dispose(&self, obj: &Self::Type) {
- while let Some(child) = obj.first_child() {
+ fn dispose(&self) {
+ while let Some(child) = self.obj().first_child() {
child.unparent();
}
}
@@ -141,11 +125,7 @@ glib::wrapper! {
impl SongWidget {
pub fn new() -> Self {
display_add_css_provider(resource!("/components/song.css"));
- glib::Object::new(&[]).expect("Failed to create an instance of SongWidget")
- }
-
- fn widget(&self) -> &imp::SongWidget {
- imp::SongWidget::from_instance(self)
+ glib::Object::new()
}
pub fn set_actions(&self, actions: Option<&gio::ActionGroup>) {
@@ -154,7 +134,7 @@ impl SongWidget {
pub fn set_menu(&self, menu: Option<&MenuModel>) {
if menu.is_some() {
- let widget = self.widget();
+ let widget = self.imp();
widget.menu_btn.set_menu_model(menu);
widget
.menu_btn
@@ -174,7 +154,7 @@ impl SongWidget {
}
fn set_image(&self, pixbuf: Option<&gdk_pixbuf::Pixbuf>) {
- self.widget().song_cover.set_from_pixbuf(pixbuf);
+ self.imp().song_cover.set_from_pixbuf(pixbuf);
}
pub fn set_art(&self, model: &SongModel, worker: Worker) {
@@ -191,7 +171,7 @@ impl SongWidget {
}
pub fn bind(&self, model: &SongModel, worker: Worker, show_cover: bool) {
- let widget = self.widget();
+ let widget = self.imp();
model.bind_title(&*widget.song_title, "label");
model.bind_artist(&*widget.song_artist, "label");
diff --git a/src/app/components/playlist/song.ui b/src/app/components/playlist/song.ui
index 341f93a5..87b0818d 100644
--- a/src/app/components/playlist/song.ui
+++ b/src/app/components/playlist/song.ui
@@ -67,7 +67,7 @@
11
- 3
+ 210
diff --git a/src/app/components/playlist_details/mod.rs b/src/app/components/playlist_details/mod.rs
index 741938a0..9680fa6c 100644
--- a/src/app/components/playlist_details/mod.rs
+++ b/src/app/components/playlist_details/mod.rs
@@ -1,5 +1,13 @@
mod playlist_details;
mod playlist_details_model;
+mod playlist_header;
+mod playlist_headerbar;
pub use playlist_details::*;
pub use playlist_details_model::*;
+
+use glib::StaticType;
+
+pub fn expose_widgets() {
+ playlist_headerbar::PlaylistHeaderBarWidget::static_type();
+}
diff --git a/src/app/components/playlist_details/playlist_details.rs b/src/app/components/playlist_details/playlist_details.rs
index ad78c4f5..c40e5073 100644
--- a/src/app/components/playlist_details/playlist_details.rs
+++ b/src/app/components/playlist_details/playlist_details.rs
@@ -3,12 +3,16 @@ use gtk::subclass::prelude::*;
use gtk::CompositeTemplate;
use std::rc::Rc;
+use super::playlist_header::PlaylistHeaderWidget;
+use super::playlist_headerbar::PlaylistHeaderBarWidget;
use super::PlaylistDetailsModel;
-use crate::app::components::AlbumHeaderWidget;
-use crate::app::components::{Component, EventListener, Playlist};
+use crate::app::components::{
+ Component, EventListener, Playlist, PlaylistModel, ScrollingHeaderWidget,
+};
use crate::app::dispatch::Worker;
use crate::app::loader::ImageLoader;
+use crate::app::state::SelectionEvent;
use crate::app::{AppEvent, BrowserEvent};
use libadwaita::subclass::prelude::BinImpl;
@@ -20,16 +24,16 @@ mod imp {
#[template(resource = "/dev/alextren/Spot/components/playlist_details.ui")]
pub struct PlaylistDetailsWidget {
#[template_child]
- pub scrolled_window: TemplateChild,
+ pub headerbar: TemplateChild,
#[template_child]
- pub header_revealer: TemplateChild,
+ pub scrolling_header: TemplateChild,
#[template_child]
- pub header_widget: TemplateChild,
+ pub header_widget: TemplateChild,
#[template_child]
- pub header_mobile: TemplateChild,
+ pub header_mobile: TemplateChild,
#[template_child]
pub tracks: TemplateChild,
@@ -42,7 +46,7 @@ mod imp {
type ParentType = libadwaita::Bin;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -51,11 +55,15 @@ mod imp {
}
impl ObjectImpl for PlaylistDetailsWidget {
- fn constructed(&self, obj: &Self::Type) {
- self.parent_constructed(obj);
+ fn constructed(&self) {
+ self.parent_constructed();
self.header_mobile.set_centered();
- self.header_mobile.hide_actions();
- self.header_widget.hide_actions();
+ self.header_widget.set_grows_automatically();
+ self.header_widget
+ .entry()
+ .bind_property("text", self.header_mobile.entry(), "text")
+ .flags(glib::BindingFlags::BIDIRECTIONAL)
+ .build();
}
}
@@ -69,81 +77,110 @@ glib::wrapper! {
impl PlaylistDetailsWidget {
fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create an instance of PlaylistDetailsWidget")
- }
-
- fn widget(&self) -> &imp::PlaylistDetailsWidget {
- imp::PlaylistDetailsWidget::from_instance(self)
+ glib::Object::new()
}
fn playlist_tracks_widget(&self) -> >k::ListView {
- self.widget().tracks.as_ref()
+ self.imp().tracks.as_ref()
}
fn connect_bottom_edge(&self, f: F)
where
F: Fn() + 'static,
{
- self.widget()
- .scrolled_window
- .connect_edge_reached(move |_, pos| {
- if let gtk::PositionType::Bottom = pos {
- f()
- }
- });
- }
-
- fn set_header_visible(&self, visible: bool) -> bool {
- let widget = self.widget();
- let is_up_to_date = widget.header_revealer.reveals_child() == visible;
- if !is_up_to_date {
- widget.header_revealer.set_reveal_child(visible);
+ self.imp().scrolling_header.connect_bottom_edge(f);
+ }
+
+ fn set_header_visible(&self, visible: bool) {
+ let widget = self.imp();
+ widget.headerbar.set_title_visible(true);
+ if visible {
+ widget.headerbar.add_classes(&["flat"]);
+ } else {
+ widget.headerbar.remove_classes(&["flat"]);
}
- is_up_to_date
}
fn connect_header(&self) {
- self.set_header_visible(true);
-
- let scroll_controller =
- gtk::EventControllerScroll::new(gtk::EventControllerScrollFlags::VERTICAL);
- scroll_controller.connect_scroll(
- clone!(@weak self as _self => @default-return gtk::Inhibit(false), move |_, _, dy| {
- gtk::Inhibit(!_self.set_header_visible(dy < 0f64))
+ self.set_header_visible(false);
+ self.imp().scrolling_header.connect_header_visibility(
+ clone!(@weak self as _self => move |visible| {
+ _self.set_header_visible(visible);
}),
);
-
- let widget = self.widget();
- widget.scrolled_window.add_controller(&scroll_controller);
}
fn set_loaded(&self) {
- let context = self.style_context();
+ let context = self.imp().scrolling_header.style_context();
context.add_class("container--loaded");
}
- fn set_album_and_artist(&self, album: &str, artist: &str) {
- self.widget()
- .header_widget
- .set_album_and_artist_and_year(album, artist, None);
- self.widget()
- .header_mobile
- .set_album_and_artist_and_year(album, artist, None);
+ fn set_editing(&self, editing: bool) {
+ self.imp().header_widget.set_editing(editing);
+ self.imp().header_mobile.set_editing(editing);
+ self.imp().headerbar.set_editing(editing);
+ }
+
+ fn set_editable(&self, editing: bool) {
+ self.imp().headerbar.set_editable(editing);
+ }
+
+ fn set_info(&self, playlist: &str, owner: &str) {
+ self.imp().header_widget.set_info(playlist, owner);
+ self.imp().header_mobile.set_info(playlist, owner);
+ self.imp().headerbar.set_title(Some(playlist));
}
fn set_artwork(&self, art: &gdk_pixbuf::Pixbuf) {
- self.widget().header_widget.set_artwork(art);
- self.widget().header_mobile.set_artwork(art);
+ self.imp().header_widget.set_artwork(art);
+ self.imp().header_mobile.set_artwork(art);
}
- fn connect_artist_clicked(&self, f: F)
+ fn connect_owner_clicked(&self, f: F)
where
F: Fn() + Clone + 'static,
{
- self.widget()
- .header_widget
- .connect_artist_clicked(f.clone());
- self.widget().header_mobile.connect_artist_clicked(f);
+ self.imp().header_widget.connect_owner_clicked(f.clone());
+ self.imp().header_mobile.connect_owner_clicked(f);
+ }
+
+ pub fn connect_edit(&self, f: F)
+ where
+ F: Fn() + 'static,
+ {
+ self.imp().headerbar.connect_edit(f);
+ }
+
+ pub fn connect_cancel(&self, f: F)
+ where
+ F: Fn() + 'static,
+ {
+ self.imp()
+ .headerbar
+ .connect_cancel(clone!(@weak self as _self => move || {
+ _self.imp().header_widget.reset_playlist_name();
+ _self.imp().header_mobile.reset_playlist_name();
+ f();
+ }));
+ }
+
+ pub fn connect_done(&self, f: F)
+ where
+ F: Fn(String) + 'static,
+ {
+ self.imp()
+ .headerbar
+ .connect_ok(clone!(@weak self as _self => move || {
+ let s = _self.imp().header_widget.get_edited_playlist_name();
+ f(s);
+ }));
+ }
+
+ pub fn connect_go_back(&self, f: F)
+ where
+ F: Fn() + 'static,
+ {
+ self.imp().headerbar.connect_go_back(f);
}
}
@@ -159,6 +196,7 @@ impl PlaylistDetails {
if model.get_playlist_info().is_none() {
model.load_playlist_info();
}
+
let widget = PlaylistDetailsWidget::new();
let playlist = Box::new(Playlist::new(
widget.playlist_tracks_widget().clone(),
@@ -166,16 +204,28 @@ impl PlaylistDetails {
worker.clone(),
));
+ widget.set_editable(model.is_playlist_editable());
+
widget.connect_header();
widget.connect_bottom_edge(clone!(@weak model => move || {
model.load_more_tracks();
}));
- widget.connect_artist_clicked(clone!(@weak model => move || {
- model.view_owner();
+ widget.connect_owner_clicked(clone!(@weak model => move || model.view_owner()));
+
+ widget.connect_edit(clone!(@weak model => move || {
+ model.enable_selection();
}));
+ widget.connect_cancel(clone!(@weak model => move || model.disable_selection()));
+ widget.connect_done(clone!(@weak model => move |n| {
+ model.disable_selection();
+ model.update_playlist_details(n);
+ }));
+
+ widget.connect_go_back(clone!(@weak model => move || model.go_back()));
+
Self {
model,
worker,
@@ -190,7 +240,7 @@ impl PlaylistDetails {
let owner = &info.owner.display_name[..];
let art_url = info.art.as_ref();
- self.widget.set_album_and_artist(title, owner);
+ self.widget.set_info(title, owner);
if let Some(art_url) = art_url.cloned() {
let widget = self.widget.downgrade();
@@ -208,6 +258,13 @@ impl PlaylistDetails {
}
}
}
+
+ fn set_editing(&self, editable: bool) {
+ if !self.model.is_playlist_editable() {
+ return;
+ }
+ self.widget.set_editing(editable);
+ }
}
impl Component for PlaylistDetails {
@@ -228,6 +285,9 @@ impl EventListener for PlaylistDetails {
{
self.update_details()
}
+ AppEvent::SelectionEvent(SelectionEvent::SelectionModeChanged(editing)) => {
+ self.set_editing(*editing);
+ }
_ => {}
}
self.broadcast_event(event);
diff --git a/src/app/components/playlist_details/playlist_details.ui b/src/app/components/playlist_details/playlist_details.ui
index f5851aee..99d7e83f 100644
--- a/src/app/components/playlist_details/playlist_details.ui
+++ b/src/app/components/playlist_details/playlist_details.ui
@@ -9,13 +9,15 @@
11
-
-
\ No newline at end of file
diff --git a/src/app/components/playlist_details/playlist_details_model.rs b/src/app/components/playlist_details/playlist_details_model.rs
index 9349f8a1..f6903686 100644
--- a/src/app/components/playlist_details/playlist_details_model.rs
+++ b/src/app/components/playlist_details/playlist_details_model.rs
@@ -4,16 +4,14 @@ use std::ops::Deref;
use std::rc::Rc;
use crate::api::SpotifyApiError;
-use crate::app::components::SimpleHeaderBarModel;
use crate::app::components::{labels, PlaylistModel};
use crate::app::models::*;
use crate::app::state::SelectionContext;
use crate::app::state::{BrowserAction, PlaybackAction, SelectionAction, SelectionState};
-use crate::app::{ActionDispatcher, AppAction, AppEvent, AppModel, BatchQuery, SongsSource};
+use crate::app::{ActionDispatcher, AppAction, AppModel, BatchQuery, SongsSource};
pub struct PlaylistDetailsModel {
pub id: String,
- _editable_selection_context: SelectionContext,
app_model: Rc,
dispatcher: Box,
}
@@ -21,14 +19,13 @@ pub struct PlaylistDetailsModel {
impl PlaylistDetailsModel {
pub fn new(id: String, app_model: Rc, dispatcher: Box) -> Self {
Self {
- id: id.clone(),
- _editable_selection_context: SelectionContext::EditablePlaylist(id),
+ id,
app_model,
dispatcher,
}
}
- fn is_playlist_editable(&self) -> bool {
+ pub fn is_playlist_editable(&self) -> bool {
let state = self.app_model.get_state();
state.logged_user.playlists.iter().any(|p| p.id == self.id)
}
@@ -85,6 +82,19 @@ impl PlaylistDetailsModel {
Some(())
}
+ pub fn update_playlist_details(&self, title: String) {
+ let api = self.app_model.get_spotify();
+ let id = self.id.clone();
+ self.dispatcher
+ .call_spotify_and_dispatch(move || async move {
+ let playlist = api.update_playlist_details(&id, title.clone()).await;
+ match playlist {
+ Ok(_) => Ok(AppAction::UpdatePlaylistName(PlaylistSummary { id, title })),
+ Err(e) => Err(e),
+ }
+ });
+ }
+
pub fn view_owner(&self) {
if let Some(playlist) = self.get_playlist_info() {
let owner = &playlist.owner.id;
@@ -92,6 +102,15 @@ impl PlaylistDetailsModel {
.dispatch(AppAction::ViewUser(owner.to_owned()));
}
}
+
+ pub fn disable_selection(&self) {
+ self.dispatcher.dispatch(AppAction::CancelSelection);
+ }
+
+ pub fn go_back(&self) {
+ self.dispatcher
+ .dispatch(BrowserAction::NavigationPop.into());
+ }
}
impl PlaylistModel for PlaylistDetailsModel {
@@ -169,9 +188,12 @@ impl PlaylistModel for PlaylistDetailsModel {
}
fn enable_selection(&self) -> bool {
- self.dispatcher.dispatch(AppAction::EnableSelection(
- self.selection_context().unwrap().clone(),
- ));
+ self.dispatcher
+ .dispatch(AppAction::EnableSelection(if self.is_playlist_editable() {
+ SelectionContext::EditablePlaylist(self.id.clone())
+ } else {
+ SelectionContext::Playlist
+ }));
true
}
@@ -179,27 +201,3 @@ impl PlaylistModel for PlaylistDetailsModel {
Some(Box::new(self.app_model.map_state(|s| &s.selection)))
}
}
-
-impl SimpleHeaderBarModel for PlaylistDetailsModel {
- fn title(&self) -> Option {
- None
- }
-
- fn title_updated(&self, _: &AppEvent) -> bool {
- false
- }
-
- fn selection_context(&self) -> Option<&SelectionContext> {
- Some(if self.is_playlist_editable() {
- &self._editable_selection_context
- } else {
- &SelectionContext::Playlist
- })
- }
-
- fn select_all(&self) {
- let songs: Vec = self.song_list_model().collect();
- self.dispatcher
- .dispatch(SelectionAction::Select(songs).into());
- }
-}
diff --git a/src/app/components/playlist_details/playlist_header.css b/src/app/components/playlist_details/playlist_header.css
new file mode 100644
index 00000000..2df9145f
--- /dev/null
+++ b/src/app/components/playlist_details/playlist_header.css
@@ -0,0 +1,46 @@
+.playlist__header .title-4 label {
+ color: @window_fg_color;
+ font-weight: bold;
+ text-decoration: none;
+}
+
+.playlist__header .title-4:hover {
+ border-radius: 6px;
+ background-image: image(alpha(currentColor, 0.08));
+}
+
+.playlist__header .like__button {
+ margin-right: 6px;
+}
+
+.playlist__header .vertical {
+ margin-left: 18px;
+}
+
+.playlist__header .card {
+ margin-top: 18px;
+ margin-left: 6px;
+ margin-bottom: 6px;
+}
+
+clamp.playlist_details__clamp {
+ background-color: @view_bg_color;
+ box-shadow: inset 0px -1px 0px @borders;
+}
+
+headerbar.playlist_details__headerbar {
+ transition: background-color .3s ease;
+}
+
+headerbar.flat.playlist_details__headerbar windowtitle {
+ opacity: 0;
+}
+
+headerbar.playlist_details__headerbar windowtitle {
+ transition: opacity .3s ease;
+ opacity: 1;
+}
+
+.playlist_details__headerbar.flat {
+ background-color: @view_bg_color;
+}
\ No newline at end of file
diff --git a/src/app/components/playlist_details/playlist_header.rs b/src/app/components/playlist_details/playlist_header.rs
new file mode 100644
index 00000000..cb3f560c
--- /dev/null
+++ b/src/app/components/playlist_details/playlist_header.rs
@@ -0,0 +1,149 @@
+use crate::app::components::display_add_css_provider;
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+use gtk::{glib, CompositeTemplate};
+
+const CSS_RO_ENTRY: &str = "playlist__title-entry--ro";
+
+mod imp {
+
+ use std::cell::RefCell;
+ use std::convert::TryFrom;
+
+ use glib::{ParamSpec, Properties};
+
+ use super::*;
+
+ #[derive(Debug, Default, CompositeTemplate, Properties)]
+ #[template(resource = "/dev/alextren/Spot/components/playlist_header.ui")]
+ #[properties(wrapper_type = super::PlaylistHeaderWidget)]
+ pub struct PlaylistHeaderWidget {
+ #[template_child]
+ pub playlist_label_entry: TemplateChild,
+
+ #[template_child]
+ pub playlist_art: TemplateChild,
+
+ #[template_child]
+ pub playlist_info: TemplateChild,
+
+ #[template_child]
+ pub author_button: TemplateChild,
+
+ #[template_child]
+ pub author_button_label: TemplateChild,
+
+ #[property(get, set, name = "original-entry-text")]
+ pub original_entry_text: RefCell,
+ }
+
+ #[glib::object_subclass]
+ impl ObjectSubclass for PlaylistHeaderWidget {
+ const NAME: &'static str = "PlaylistHeaderWidget";
+ type Type = super::PlaylistHeaderWidget;
+ type ParentType = gtk::Box;
+
+ fn class_init(klass: &mut Self::Class) {
+ Self::bind_template(klass);
+ }
+
+ fn instance_init(obj: &glib::subclass::InitializingObject) {
+ display_add_css_provider(resource!("/components/playlist_header.css"));
+ obj.init_template();
+ }
+ }
+
+ impl ObjectImpl for PlaylistHeaderWidget {
+ fn properties() -> &'static [ParamSpec] {
+ Self::derived_properties()
+ }
+
+ fn set_property(&self, id: usize, value: &glib::Value, pspec: &glib::ParamSpec) {
+ self.derived_set_property(id, value, pspec);
+ }
+
+ fn property(&self, id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+ self.derived_property(id, pspec)
+ }
+
+ fn constructed(&self) {
+ self.parent_constructed();
+ }
+ }
+
+ impl WidgetImpl for PlaylistHeaderWidget {}
+ impl BoxImpl for PlaylistHeaderWidget {}
+}
+
+glib::wrapper! {
+ pub struct PlaylistHeaderWidget(ObjectSubclass) @extends gtk::Widget, gtk::Box;
+}
+
+impl PlaylistHeaderWidget {
+ pub fn new() -> Self {
+ glib::Object::new()
+ }
+
+ pub fn connect_owner_clicked(&self, f: F)
+ where
+ F: Fn() + 'static,
+ {
+ self.imp().author_button.connect_activate_link(move |_| {
+ f();
+ glib::signal::Inhibit(true)
+ });
+ }
+
+ pub fn reset_playlist_name(&self) {
+ self.imp()
+ .playlist_label_entry
+ .set_text(&self.original_entry_text());
+ }
+
+ pub fn get_edited_playlist_name(&self) -> String {
+ self.imp().playlist_label_entry.text().to_string()
+ }
+
+ pub fn set_artwork(&self, art: &gdk_pixbuf::Pixbuf) {
+ self.imp().playlist_art.set_from_pixbuf(Some(art));
+ }
+
+ pub fn set_info(&self, playlist: &str, owner: &str) {
+ let widget = self.imp();
+ self.set_original_entry_text(playlist);
+ widget.playlist_label_entry.set_text(playlist);
+ widget
+ .playlist_label_entry
+ .set_placeholder_text(Some(playlist));
+ widget.author_button_label.set_label(owner);
+ }
+
+ pub fn set_centered(&self) {
+ let widget = self.imp();
+ widget.playlist_info.set_halign(gtk::Align::Center);
+ }
+
+ pub fn set_editing(&self, editing: bool) {
+ let widget = self.imp();
+ widget.playlist_label_entry.set_can_focus(editing);
+ widget.playlist_label_entry.set_editable(editing);
+ if editing {
+ widget.playlist_label_entry.remove_css_class(CSS_RO_ENTRY);
+ } else {
+ widget.playlist_label_entry.add_css_class(CSS_RO_ENTRY);
+ }
+ }
+
+ pub fn entry(&self) -> >k::Entry {
+ self.imp().playlist_label_entry.as_ref()
+ }
+
+ pub fn set_grows_automatically(&self) {
+ let entry: >k::Entry = &self.imp().playlist_label_entry;
+ entry
+ .bind_property("text", entry, "width-chars")
+ .transform_to(|_, text: &str| Some(text.len() as i32))
+ .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE)
+ .build();
+ }
+}
diff --git a/src/app/components/playlist_details/playlist_header.ui b/src/app/components/playlist_details/playlist_header.ui
new file mode 100644
index 00000000..ad0f6245
--- /dev/null
+++ b/src/app/components/playlist_details/playlist_header.ui
@@ -0,0 +1,72 @@
+
+
+
+
+
+ start
+ 0
+ 6
+ 6
+ 6
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/components/playlist_details/playlist_headerbar.rs b/src/app/components/playlist_details/playlist_headerbar.rs
new file mode 100644
index 00000000..f727a555
--- /dev/null
+++ b/src/app/components/playlist_details/playlist_headerbar.rs
@@ -0,0 +1,160 @@
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+use gtk::CompositeTemplate;
+use libadwaita::subclass::prelude::BinImpl;
+
+mod imp {
+
+ use super::*;
+
+ #[derive(Debug, Default, CompositeTemplate)]
+ #[template(resource = "/dev/alextren/Spot/components/playlist_headerbar.ui")]
+ pub struct PlaylistHeaderBarWidget {
+ #[template_child]
+ pub main_header: TemplateChild,
+
+ #[template_child]
+ pub edition_header: TemplateChild,
+
+ #[template_child]
+ pub go_back: TemplateChild,
+
+ #[template_child]
+ pub title: TemplateChild,
+
+ #[template_child]
+ pub edit: TemplateChild,
+
+ #[template_child]
+ pub ok: TemplateChild,
+
+ #[template_child]
+ pub cancel: TemplateChild,
+
+ #[template_child]
+ pub overlay: TemplateChild,
+ }
+
+ #[glib::object_subclass]
+ impl ObjectSubclass for PlaylistHeaderBarWidget {
+ const NAME: &'static str = "PlaylistHeaderBarWidget";
+ type Type = super::PlaylistHeaderBarWidget;
+ type ParentType = libadwaita::Bin;
+ type Interfaces = (gtk::Buildable,);
+
+ fn class_init(klass: &mut Self::Class) {
+ Self::bind_template(klass);
+ }
+
+ fn instance_init(obj: &glib::subclass::InitializingObject) {
+ obj.init_template();
+ }
+ }
+
+ impl ObjectImpl for PlaylistHeaderBarWidget {}
+
+ impl BuildableImpl for PlaylistHeaderBarWidget {
+ fn add_child(&self, builder: >k::Builder, child: &glib::Object, type_: Option<&str>) {
+ if Some("root") == type_ {
+ self.parent_add_child(builder, child, type_);
+ } else {
+ self.main_header
+ .set_title_widget(child.downcast_ref::());
+ }
+ }
+ }
+
+ impl WidgetImpl for PlaylistHeaderBarWidget {}
+ impl BinImpl for PlaylistHeaderBarWidget {}
+ impl WindowImpl for PlaylistHeaderBarWidget {}
+}
+
+glib::wrapper! {
+ pub struct PlaylistHeaderBarWidget(ObjectSubclass) @extends gtk::Widget, libadwaita::Bin;
+}
+
+impl PlaylistHeaderBarWidget {
+ pub fn new() -> Self {
+ glib::Object::new()
+ }
+
+ pub fn connect_edit(&self, f: F)
+ where
+ F: Fn() + 'static,
+ {
+ self.imp().edit.connect_clicked(move |_| f());
+ }
+
+ pub fn connect_ok(&self, f: F)
+ where
+ F: Fn() + 'static,
+ {
+ self.imp().ok.connect_clicked(move |_| f());
+ }
+
+ pub fn connect_cancel(&self, f: F)
+ where
+ F: Fn() + 'static,
+ {
+ self.imp().cancel.connect_clicked(move |_| f());
+ }
+
+ pub fn connect_go_back(&self, f: F)
+ where
+ F: Fn() + 'static,
+ {
+ self.imp().go_back.connect_clicked(move |_| f());
+ }
+
+ pub fn bind_to_leaflet(&self, leaflet: &libadwaita::Leaflet) {
+ leaflet
+ .bind_property(
+ "folded",
+ &*self.imp().main_header,
+ "show-start-title-buttons",
+ )
+ .build();
+ leaflet.notify("folded");
+ }
+
+ pub fn set_can_go_back(&self, can_go_back: bool) {
+ self.imp().go_back.set_visible(can_go_back);
+ }
+
+ pub fn set_editable(&self, editable: bool) {
+ self.imp().edit.set_visible(editable);
+ }
+
+ pub fn set_editing(&self, editing: bool) {
+ if editing {
+ self.imp().edition_header.show();
+ } else {
+ self.imp().edition_header.hide();
+ }
+ }
+
+ pub fn add_classes(&self, classes: &[&str]) {
+ let context = self.imp().main_header.style_context();
+ for &class in classes {
+ context.add_class(class);
+ }
+ }
+
+ pub fn remove_classes(&self, classes: &[&str]) {
+ let context = self.imp().main_header.style_context();
+ for &class in classes {
+ context.remove_class(class);
+ }
+ }
+
+ pub fn set_title_visible(&self, visible: bool) {
+ self.imp().title.set_visible(visible);
+ }
+
+ pub fn set_title(&self, title: Option<&str>) {
+ self.imp().title.set_visible(title.is_some());
+ if let Some(title) = title {
+ self.imp().title.set_title(title);
+ }
+ }
+}
diff --git a/src/app/components/playlist_details/playlist_headerbar.ui b/src/app/components/playlist_details/playlist_headerbar.ui
new file mode 100644
index 00000000..331ced0f
--- /dev/null
+++ b/src/app/components/playlist_details/playlist_headerbar.ui
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/components/saved_playlists/saved_playlists.rs b/src/app/components/saved_playlists/saved_playlists.rs
index 3016c44e..6b5fdcde 100644
--- a/src/app/components/saved_playlists/saved_playlists.rs
+++ b/src/app/components/saved_playlists/saved_playlists.rs
@@ -33,7 +33,7 @@ mod imp {
type ParentType = gtk::Box;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -52,14 +52,14 @@ glib::wrapper! {
impl SavedPlaylistsWidget {
pub fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create an instance of SavedPlaylistsWidget")
+ glib::Object::new()
}
fn connect_bottom_edge(&self, f: F)
where
F: Fn() + 'static,
{
- imp::SavedPlaylistsWidget::from_instance(self)
+ self.imp()
.scrolled_window
.connect_edge_reached(move |_, pos| {
if let gtk::PositionType::Bottom = pos {
@@ -72,7 +72,7 @@ impl SavedPlaylistsWidget {
where
F: Fn(String) + Clone + 'static,
{
- imp::SavedPlaylistsWidget::from_instance(self)
+ self.imp()
.flowbox
.bind_model(Some(store.unsafe_store()), move |item| {
let album_model = item.downcast_ref::().unwrap();
@@ -89,7 +89,7 @@ impl SavedPlaylistsWidget {
});
}
pub fn get_status_page(&self) -> &libadwaita::StatusPage {
- &imp::SavedPlaylistsWidget::from_instance(self).status_page
+ &self.imp().status_page
}
}
@@ -119,7 +119,7 @@ impl SavedPlaylists {
fn bind_flowbox(&self) {
self.widget.bind_albums(
self.worker.clone(),
- &*self.model.get_list_store().unwrap(),
+ &self.model.get_list_store().unwrap(),
clone!(@weak self.model as model => move |id| {
model.open_playlist(id);
}),
diff --git a/src/app/components/saved_playlists/saved_playlists_model.rs b/src/app/components/saved_playlists/saved_playlists_model.rs
index 0140c150..062aadff 100644
--- a/src/app/components/saved_playlists/saved_playlists_model.rs
+++ b/src/app/components/saved_playlists/saved_playlists_model.rs
@@ -23,10 +23,6 @@ impl SavedPlaylistsModel {
self.app_model.map_state_opt(|s| s.browser.home_state())
}
- pub fn get_playlists(&self) -> ListStore {
- self.state().unwrap().playlists.clone()
- }
-
pub fn get_list_store(&self) -> Option> + '_> {
Some(Ref::map(self.state()?, |s| &s.playlists))
}
@@ -71,8 +67,4 @@ impl SavedPlaylistsModel {
pub fn open_playlist(&self, id: String) {
self.dispatcher.dispatch(AppAction::ViewPlaylist(id));
}
-
- pub fn clone(&self) -> SavedPlaylistsModel {
- SavedPlaylistsModel::new(self.app_model.clone(), self.dispatcher.box_clone())
- }
}
diff --git a/src/app/components/saved_tracks/saved_tracks.rs b/src/app/components/saved_tracks/saved_tracks.rs
index 76f8881a..715ac28b 100644
--- a/src/app/components/saved_tracks/saved_tracks.rs
+++ b/src/app/components/saved_tracks/saved_tracks.rs
@@ -30,7 +30,7 @@ mod imp {
type ParentType = libadwaita::Bin;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -49,14 +49,14 @@ glib::wrapper! {
impl SavedTracksWidget {
fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create an instance of SavedTracksWidget")
+ glib::Object::new()
}
fn connect_bottom_edge(&self, f: F)
where
F: Fn() + 'static,
{
- imp::SavedTracksWidget::from_instance(self)
+ self.imp()
.scrolled_window
.connect_edge_reached(move |_, pos| {
if let gtk::PositionType::Bottom = pos {
@@ -66,9 +66,7 @@ impl SavedTracksWidget {
}
fn song_list_widget(&self) -> >k::ListView {
- imp::SavedTracksWidget::from_instance(self)
- .song_list
- .as_ref()
+ self.imp().song_list.as_ref()
}
}
diff --git a/src/app/components/scrolling_header/mod.rs b/src/app/components/scrolling_header/mod.rs
new file mode 100644
index 00000000..1f8c390c
--- /dev/null
+++ b/src/app/components/scrolling_header/mod.rs
@@ -0,0 +1,7 @@
+mod scrolling_header_widget;
+use glib::StaticType;
+pub use scrolling_header_widget::*;
+
+pub fn expose_widgets() {
+ scrolling_header_widget::ScrollingHeaderWidget::static_type();
+}
diff --git a/src/app/components/scrolling_header/scrolling_header.ui b/src/app/components/scrolling_header/scrolling_header.ui
new file mode 100644
index 00000000..04a65c31
--- /dev/null
+++ b/src/app/components/scrolling_header/scrolling_header.ui
@@ -0,0 +1,23 @@
+
+
+
+
+
+ vertical
+ 1
+ 1
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/components/scrolling_header/scrolling_header_widget.rs b/src/app/components/scrolling_header/scrolling_header_widget.rs
new file mode 100644
index 00000000..85be0059
--- /dev/null
+++ b/src/app/components/scrolling_header/scrolling_header_widget.rs
@@ -0,0 +1,117 @@
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+use gtk::CompositeTemplate;
+
+mod imp {
+
+ use super::*;
+
+ #[derive(Debug, Default, CompositeTemplate)]
+ #[template(resource = "/dev/alextren/Spot/components/scrolling_header.ui")]
+ pub struct ScrollingHeaderWidget {
+ #[template_child]
+ pub scrolled_window: TemplateChild,
+
+ #[template_child]
+ pub revealer: TemplateChild,
+ }
+
+ #[glib::object_subclass]
+ impl ObjectSubclass for ScrollingHeaderWidget {
+ const NAME: &'static str = "ScrollingHeaderWidget";
+ type Type = super::ScrollingHeaderWidget;
+ type ParentType = gtk::Box;
+ type Interfaces = (gtk::Buildable,);
+
+ fn class_init(klass: &mut Self::Class) {
+ klass.bind_template();
+ }
+
+ fn instance_init(obj: &glib::subclass::InitializingObject) {
+ obj.init_template();
+ }
+ }
+
+ impl ObjectImpl for ScrollingHeaderWidget {
+ fn constructed(&self) {
+ self.parent_constructed();
+ }
+ }
+
+ impl BuildableImpl for ScrollingHeaderWidget {
+ fn add_child(&self, builder: >k::Builder, child: &glib::Object, type_: Option<&str>) {
+ let child_widget = child.downcast_ref::();
+ match type_ {
+ Some("internal") => self.parent_add_child(builder, child, type_),
+ Some("header") => self.revealer.set_child(child_widget),
+ _ => self.scrolled_window.set_child(child_widget),
+ }
+ }
+ }
+
+ impl WidgetImpl for ScrollingHeaderWidget {}
+ impl BoxImpl for ScrollingHeaderWidget {}
+}
+
+glib::wrapper! {
+ pub struct ScrollingHeaderWidget(ObjectSubclass) @extends gtk::Widget, gtk::Box;
+}
+
+impl ScrollingHeaderWidget {
+ fn set_header_visible(&self, visible: bool) -> bool {
+ let widget = self.imp();
+ let is_up_to_date = widget.revealer.reveals_child() == visible;
+ if !is_up_to_date {
+ widget.revealer.set_reveal_child(visible);
+ }
+ is_up_to_date
+ }
+
+ fn is_scrolled_to_top(&self) -> bool {
+ self.imp().scrolled_window.vadjustment().value() <= f64::EPSILON
+ || self.imp().revealer.reveals_child()
+ }
+
+ pub fn connect_header_visibility(&self, f: F)
+ where
+ F: Fn(bool) + Clone + 'static,
+ {
+ self.set_header_visible(true);
+ f(true);
+
+ let scroll_controller =
+ gtk::EventControllerScroll::new(gtk::EventControllerScrollFlags::VERTICAL);
+ scroll_controller.connect_scroll(
+ clone!(@strong f, @weak self as _self => @default-return gtk::Inhibit(false), move |_, _, dy| {
+ let visible = dy < 0f64 && _self.is_scrolled_to_top();
+ f(visible);
+ gtk::Inhibit(!_self.set_header_visible(visible))
+ }),
+ );
+
+ let swipe_controller = gtk::GestureSwipe::new();
+ swipe_controller.set_touch_only(true);
+ swipe_controller.set_propagation_phase(gtk::PropagationPhase::Capture);
+ swipe_controller.connect_swipe(clone!(@weak self as _self => move |_, _, dy| {
+ let visible = dy >= 0f64 && _self.is_scrolled_to_top();
+ f(visible);
+ _self.set_header_visible(visible);
+ }));
+
+ self.imp().scrolled_window.add_controller(scroll_controller);
+ self.add_controller(swipe_controller);
+ }
+
+ pub fn connect_bottom_edge(&self, f: F)
+ where
+ F: Fn() + 'static,
+ {
+ self.imp()
+ .scrolled_window
+ .connect_edge_reached(move |_, pos| {
+ if let gtk::PositionType::Bottom = pos {
+ f()
+ }
+ });
+ }
+}
diff --git a/src/app/components/search/search.rs b/src/app/components/search/search.rs
index 46d516e4..7f2c6671 100644
--- a/src/app/components/search/search.rs
+++ b/src/app/components/search/search.rs
@@ -46,7 +46,7 @@ mod imp {
type ParentType = gtk::Box;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -58,7 +58,7 @@ mod imp {
impl BoxImpl for SearchResultsWidget {}
impl WidgetImpl for SearchResultsWidget {
- fn grab_focus(&self, _: &Self::Type) -> bool {
+ fn grab_focus(&self) -> bool {
self.search_entry.grab_focus()
}
}
@@ -70,18 +70,14 @@ glib::wrapper! {
impl SearchResultsWidget {
pub fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create an instance of SearchResultsWidget")
- }
-
- fn widget(&self) -> &imp::SearchResultsWidget {
- imp::SearchResultsWidget::from_instance(self)
+ glib::Object::new()
}
pub fn bind_to_leaflet(&self, leaflet: &libadwaita::Leaflet) {
leaflet
.bind_property(
"folded",
- &*self.widget().main_header,
+ &*self.imp().main_header,
"show-start-title-buttons",
)
.build();
@@ -92,20 +88,20 @@ impl SearchResultsWidget {
where
F: Fn() + 'static,
{
- self.widget().go_back.connect_clicked(move |_| f());
+ self.imp().go_back.connect_clicked(move |_| f());
}
pub fn connect_search_updated(&self, f: F)
where
F: Fn(String) + 'static,
{
- self.widget()
+ self.imp()
.search_entry
.connect_changed(clone!(@weak self as _self => move |s| {
let query = s.text();
let query = query.as_str();
- _self.widget().status_page.set_visible(query.is_empty());
- _self.widget().search_results.set_visible(!query.is_empty());
+ _self.imp().status_page.set_visible(query.is_empty());
+ _self.imp().search_results.set_visible(!query.is_empty());
if !query.is_empty() {
f(query.to_string());
}
@@ -116,7 +112,7 @@ impl SearchResultsWidget {
where
F: Fn(String) + Clone + 'static,
{
- self.widget()
+ self.imp()
.albums_results
.bind_model(Some(store), move |item| {
wrap_flowbox_item(item, |album_model| {
@@ -134,7 +130,7 @@ impl SearchResultsWidget {
where
F: Fn(String) + Clone + 'static,
{
- self.widget()
+ self.imp()
.artist_results
.bind_model(Some(store), move |item| {
wrap_flowbox_item(item, |artist_model| {
diff --git a/src/app/components/selection/component.rs b/src/app/components/selection/component.rs
index 9fa467af..78da39b3 100644
--- a/src/app/components/selection/component.rs
+++ b/src/app/components/selection/component.rs
@@ -216,7 +216,7 @@ impl EventListener for SelectionToolbar {
AppEvent::LoginEvent(LoginEvent::UserPlaylistsLoaded) => {
let model = &self.model;
self.widget.connect_playlists(
- &*model.user_playlists(),
+ &model.user_playlists(),
clone!(@weak model => move |s| model.add_to_playlist(s)),
);
}
diff --git a/src/app/components/selection/widget.rs b/src/app/components/selection/widget.rs
index 7f3c9f66..9a1ae8dc 100644
--- a/src/app/components/selection/widget.rs
+++ b/src/app/components/selection/widget.rs
@@ -43,7 +43,7 @@ mod imp {
type ParentType = gtk::Box;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -52,8 +52,8 @@ mod imp {
}
impl ObjectImpl for SelectionToolbarWidget {
- fn constructed(&self, obj: &Self::Type) {
- self.parent_constructed(obj);
+ fn constructed(&self) {
+ self.parent_constructed();
display_add_css_provider(resource!("/components/selection_toolbar.css"));
}
}
@@ -83,75 +83,71 @@ impl SelectionToolState {
}
impl SelectionToolbarWidget {
- fn widget(&self) -> &imp::SelectionToolbarWidget {
- imp::SelectionToolbarWidget::from_instance(self)
- }
-
pub fn connect_move_down(&self, f: F)
where
F: Fn() + 'static,
{
- self.widget().move_down.connect_clicked(move |_| f());
+ self.imp().move_down.connect_clicked(move |_| f());
}
pub fn connect_move_up(&self, f: F)
where
F: Fn() + 'static,
{
- self.widget().move_up.connect_clicked(move |_| f());
+ self.imp().move_up.connect_clicked(move |_| f());
}
pub fn connect_queue(&self, f: F)
where
F: Fn() + 'static,
{
- self.widget().queue.connect_clicked(move |_| f());
+ self.imp().queue.connect_clicked(move |_| f());
}
pub fn connect_save(&self, f: F)
where
F: Fn() + 'static,
{
- self.widget().save.connect_clicked(move |_| f());
+ self.imp().save.connect_clicked(move |_| f());
}
pub fn connect_remove(&self, f: F)
where
F: Fn() + 'static,
{
- self.widget().remove.connect_clicked(move |_| f());
+ self.imp().remove.connect_clicked(move |_| f());
}
pub fn set_move(&self, state: SelectionToolState) {
- self.widget().move_up.set_sensitive(state.sensitive());
- self.widget().move_up.set_visible(state.visible());
- self.widget().move_down.set_sensitive(state.sensitive());
- self.widget().move_down.set_visible(state.visible());
+ self.imp().move_up.set_sensitive(state.sensitive());
+ self.imp().move_up.set_visible(state.visible());
+ self.imp().move_down.set_sensitive(state.sensitive());
+ self.imp().move_down.set_visible(state.visible());
}
pub fn set_queue(&self, state: SelectionToolState) {
- self.widget().queue.set_sensitive(state.sensitive());
- self.widget().queue.set_visible(state.visible());
+ self.imp().queue.set_sensitive(state.sensitive());
+ self.imp().queue.set_visible(state.visible());
}
pub fn set_add(&self, state: SelectionToolState) {
- self.widget().add.set_sensitive(state.sensitive());
- self.widget().add.set_visible(state.visible());
+ self.imp().add.set_sensitive(state.sensitive());
+ self.imp().add.set_visible(state.visible());
}
pub fn set_remove(&self, state: SelectionToolState) {
- self.widget().remove.set_sensitive(state.sensitive());
- self.widget().remove.set_visible(state.visible());
+ self.imp().remove.set_sensitive(state.sensitive());
+ self.imp().remove.set_visible(state.visible());
}
pub fn set_save(&self, state: SelectionToolState) {
- self.widget().save.set_sensitive(state.sensitive());
- self.widget().save.set_visible(state.visible());
+ self.imp().save.set_sensitive(state.sensitive());
+ self.imp().save.set_visible(state.visible());
}
pub fn set_visible(&self, visible: bool) {
gtk::Widget::set_visible(self.upcast_ref(), visible);
- self.widget().action_bar.set_revealed(visible);
+ self.imp().action_bar.set_revealed(visible);
}
pub fn connect_playlists(&self, playlists: &[PlaylistSummary], on_playlist_selected: F)
@@ -179,8 +175,8 @@ impl SelectionToolbarWidget {
}
let popover = gtk::PopoverMenu::from_model(Some(&menu));
- self.widget().add.set_popover(Some(&popover));
- self.widget()
+ self.imp().add.set_popover(Some(&popover));
+ self.imp()
.add
.insert_action_group("add_to", Some(&action_group));
}
diff --git a/src/app/components/settings/settings.rs b/src/app/components/settings/settings.rs
index 63eb0644..76df8375 100644
--- a/src/app/components/settings/settings.rs
+++ b/src/app/components/settings/settings.rs
@@ -31,6 +31,9 @@ mod imp {
#[template_child]
pub audio_backend: TemplateChild,
+ #[template_child]
+ pub gapless_playback: TemplateChild,
+
#[template_child]
pub ap_port: TemplateChild,
@@ -45,7 +48,7 @@ mod imp {
type ParentType = libadwaita::PreferencesWindow;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -66,8 +69,7 @@ glib::wrapper! {
impl SettingsWindow {
pub fn new() -> Self {
- let window: Self =
- glib::Object::new(&[]).expect("Failed to create an instance of SettingsWindow");
+ let window: Self = glib::Object::new();
window.bind_backend_and_device();
window.bind_settings();
@@ -76,7 +78,7 @@ impl SettingsWindow {
}
fn bind_backend_and_device(&self) {
- let widget = imp::SettingsWindow::from_instance(self);
+ let widget = self.imp();
let audio_backend = widget
.audio_backend
@@ -89,7 +91,7 @@ impl SettingsWindow {
audio_backend
.bind_property("selected", alsa_device_row, "visible")
- .transform_to(|_, value| value.get::().ok().map(|u| (u == 1).to_value()))
+ .transform_to(|_, value: u32| Some(value == 1))
.build();
if audio_backend.selected() == 0 {
@@ -98,7 +100,7 @@ impl SettingsWindow {
}
fn bind_settings(&self) {
- let widget = imp::SettingsWindow::from_instance(self);
+ let widget = self.imp();
let settings = gio::Settings::new(SETTINGS);
let player_bitrate = widget
@@ -162,6 +164,18 @@ impl SettingsWindow {
})
.build();
+ let gapless_playback = widget
+ .gapless_playback
+ .downcast_ref::()
+ .unwrap();
+ settings
+ .bind(
+ "gapless-playback",
+ &gapless_playback.activatable_widget().unwrap(),
+ "active",
+ )
+ .build();
+
let ap_port = widget.ap_port.downcast_ref::().unwrap();
settings
.bind("ap-port", ap_port, "text")
@@ -171,28 +185,46 @@ impl SettingsWindow {
let theme = widget.theme.downcast_ref::().unwrap();
settings
- .bind("prefers-dark-theme", theme, "selected")
+ .bind("theme-preference", theme, "selected")
.mapping(|variant, _| {
- variant
- .get::()
- .map(|prefer_dark| if prefer_dark { 1 } else { 0 }.to_value())
+ variant.str().map(|s| {
+ match s {
+ "light" => 0,
+ "dark" => 1,
+ "system" => 2,
+ _ => unreachable!(),
+ }
+ .to_value()
+ })
+ })
+ .set_mapping(|value, _| {
+ value.get::().ok().map(|u| {
+ match u {
+ 0 => "light",
+ 1 => "dark",
+ 2 => "system",
+ _ => unreachable!(),
+ }
+ .to_variant()
+ })
})
- .set_mapping(|value, _| value.get::().ok().map(|u| (u == 1).to_variant()))
.build();
}
fn connect_theme_select(&self) {
- let widget = imp::SettingsWindow::from_instance(self);
+ let widget = self.imp();
let theme = widget.theme.downcast_ref::().unwrap();
theme.connect_selected_notify(|theme| {
- let prefers_dark_theme = theme.selected() == 1;
+ debug!("Theme switched! --> value: {}", theme.selected());
let manager = libadwaita::StyleManager::default();
- manager.set_color_scheme(if prefers_dark_theme {
- libadwaita::ColorScheme::PreferDark
- } else {
- libadwaita::ColorScheme::PreferLight
- });
+ let pref = match theme.selected() {
+ 0 => libadwaita::ColorScheme::ForceLight,
+ 1 => libadwaita::ColorScheme::ForceDark,
+ _ => libadwaita::ColorScheme::Default,
+ };
+
+ manager.set_color_scheme(pref);
});
}
diff --git a/src/app/components/settings/settings.ui b/src/app/components/settings/settings.ui
index 10487e72..1dc69a1e 100644
--- a/src/app/components/settings/settings.ui
+++ b/src/app/components/settings/settings.ui
@@ -49,6 +49,20 @@
+
+
+
@@ -62,6 +76,7 @@
LightDark
+ System
diff --git a/src/app/components/sidebar/create_playlist.rs b/src/app/components/sidebar/create_playlist.rs
new file mode 100644
index 00000000..9829c465
--- /dev/null
+++ b/src/app/components/sidebar/create_playlist.rs
@@ -0,0 +1,61 @@
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+use gtk::CompositeTemplate;
+
+mod imp {
+ use super::*;
+
+ #[derive(Debug, Default, CompositeTemplate)]
+ #[template(resource = "/dev/alextren/Spot/components/create_playlist.ui")]
+ pub struct CreatePlaylistPopover {
+ #[template_child]
+ pub label: TemplateChild,
+
+ #[template_child]
+ pub entry: TemplateChild,
+
+ #[template_child]
+ pub button: TemplateChild,
+ }
+
+ #[glib::object_subclass]
+ impl ObjectSubclass for CreatePlaylistPopover {
+ const NAME: &'static str = "CreatePlaylistPopover";
+ type Type = super::CreatePlaylistPopover;
+ type ParentType = gtk::Popover;
+
+ fn class_init(klass: &mut Self::Class) {
+ Self::bind_template(klass);
+ }
+
+ fn instance_init(obj: &glib::subclass::InitializingObject) {
+ obj.init_template();
+ }
+ }
+
+ impl ObjectImpl for CreatePlaylistPopover {}
+ impl WidgetImpl for CreatePlaylistPopover {}
+ impl PopoverImpl for CreatePlaylistPopover {}
+}
+
+glib::wrapper! {
+ pub struct CreatePlaylistPopover(ObjectSubclass) @extends gtk::Widget, gtk::Popover;
+}
+
+impl CreatePlaylistPopover {
+ pub fn new() -> Self {
+ glib::Object::new()
+ }
+
+ pub fn connect_create(&self, create_fun: F) {
+ let entry = self.imp().entry.get();
+ let closure = clone!(@weak self as popover, @weak entry, @strong create_fun => move || {
+ create_fun(entry.text().to_string());
+ popover.popdown();
+ entry.buffer().delete_text(0, None);
+ });
+ let closure_clone = closure.clone();
+ entry.connect_activate(move |_| closure());
+ self.imp().button.connect_clicked(move |_| closure_clone());
+ }
+}
diff --git a/src/app/components/sidebar/create_playlist.ui b/src/app/components/sidebar/create_playlist.ui
new file mode 100644
index 00000000..5cbe8113
--- /dev/null
+++ b/src/app/components/sidebar/create_playlist.ui
@@ -0,0 +1,45 @@
+
+
+
+
+ right
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/components/sidebar_listbox/icons/library-music-symbolic.svg b/src/app/components/sidebar/icons/library-music-symbolic.svg
similarity index 100%
rename from src/app/components/sidebar_listbox/icons/library-music-symbolic.svg
rename to src/app/components/sidebar/icons/library-music-symbolic.svg
diff --git a/src/app/components/sidebar/mod.rs b/src/app/components/sidebar/mod.rs
new file mode 100644
index 00000000..5cbd4dbd
--- /dev/null
+++ b/src/app/components/sidebar/mod.rs
@@ -0,0 +1,8 @@
+mod sidebar;
+pub use sidebar::*;
+
+mod sidebar_item;
+pub use sidebar_item::*;
+
+mod create_playlist;
+mod sidebar_row;
diff --git a/src/app/components/sidebar/sidebar.rs b/src/app/components/sidebar/sidebar.rs
new file mode 100644
index 00000000..78dd2a28
--- /dev/null
+++ b/src/app/components/sidebar/sidebar.rs
@@ -0,0 +1,197 @@
+use gettextrs::gettext;
+use gtk::prelude::*;
+use std::rc::Rc;
+
+use super::create_playlist::CreatePlaylistPopover;
+use super::{
+ sidebar_row::SidebarRow, SidebarDestination, SidebarItem, CREATE_PLAYLIST_ITEM,
+ SAVED_PLAYLISTS_SECTION,
+};
+use crate::app::models::{AlbumModel, PlaylistSummary};
+use crate::app::{
+ ActionDispatcher, AppAction, AppEvent, AppModel, BrowserAction, BrowserEvent, Component,
+ EventListener,
+};
+
+const NUM_FIXED_ENTRIES: u32 = 6;
+const NUM_PLAYLISTS: usize = 20;
+
+pub struct SidebarModel {
+ app_model: Rc,
+ dispatcher: Box,
+}
+
+impl SidebarModel {
+ pub fn new(app_model: Rc, dispatcher: Box) -> Self {
+ Self {
+ app_model,
+ dispatcher,
+ }
+ }
+
+ fn get_playlists(&self) -> Vec {
+ self.app_model
+ .get_state()
+ .browser
+ .home_state()
+ .expect("expected HomeState to be available")
+ .playlists
+ .iter()
+ .take(NUM_PLAYLISTS)
+ .map(Self::map_to_destination)
+ .collect()
+ }
+
+ fn map_to_destination(a: AlbumModel) -> SidebarDestination {
+ let title = Some(a.album())
+ .filter(|s| !s.is_empty())
+ .unwrap_or_else(|| gettext("Unnamed playlist"));
+ let id = a.uri();
+ SidebarDestination::Playlist(PlaylistSummary { id, title })
+ }
+
+ fn create_new_playlist(&self, name: String) {
+ let user_id = self.app_model.get_state().logged_user.user.clone().unwrap();
+ let api = self.app_model.get_spotify();
+ self.dispatcher
+ .call_spotify_and_dispatch(move || async move {
+ api.create_new_playlist(name.as_str(), user_id.as_str())
+ .await
+ .map(AppAction::CreatePlaylist)
+ })
+ }
+
+ fn navigate(&self, dest: SidebarDestination) {
+ let actions = match dest {
+ SidebarDestination::Library
+ | SidebarDestination::SavedTracks
+ | SidebarDestination::NowPlaying
+ | SidebarDestination::SavedPlaylists => {
+ vec![BrowserAction::SetHomeVisiblePage(dest.id()).into()]
+ }
+ SidebarDestination::Playlist(PlaylistSummary { id, .. }) => vec![
+ BrowserAction::SetHomeVisiblePage(SidebarDestination::SavedPlaylists.id()).into(),
+ AppAction::ViewPlaylist(id),
+ ],
+ };
+ self.dispatcher.dispatch_many(actions);
+ }
+}
+
+pub struct Sidebar {
+ listbox: gtk::ListBox,
+ list_store: gio::ListStore,
+ model: Rc,
+}
+
+impl Sidebar {
+ pub fn new(listbox: gtk::ListBox, model: Rc) -> Self {
+ let popover = CreatePlaylistPopover::new();
+ popover.connect_create(clone!(@weak model => move |t| model.create_new_playlist(t)));
+
+ let list_store = gio::ListStore::new(SidebarItem::static_type());
+
+ list_store.append(&SidebarItem::from_destination(SidebarDestination::Library));
+ list_store.append(&SidebarItem::from_destination(
+ SidebarDestination::SavedTracks,
+ ));
+ list_store.append(&SidebarItem::from_destination(
+ SidebarDestination::NowPlaying,
+ ));
+ list_store.append(&SidebarItem::playlists_section());
+ list_store.append(&SidebarItem::create_playlist_item());
+ list_store.append(&SidebarItem::from_destination(
+ SidebarDestination::SavedPlaylists,
+ ));
+
+ listbox.bind_model(
+ Some(&list_store),
+ clone!(@weak popover => @default-panic, move |obj| {
+ let item = obj.downcast_ref::().unwrap();
+ if item.navigatable() {
+ Self::make_navigatable(item)
+ } else {
+ match item.id().as_str() {
+ SAVED_PLAYLISTS_SECTION => Self::make_section_label(item),
+ CREATE_PLAYLIST_ITEM => Self::make_create_playlist(item, popover),
+ _ => unimplemented!(),
+ }
+ }
+ }),
+ );
+
+ listbox.connect_row_activated(clone!(@weak popover, @weak model => move |_, row| {
+ if let Some(row) = row.downcast_ref::() {
+ if let Some(dest) = row.item().destination() {
+ model.navigate(dest);
+ } else {
+ match row.item().id().as_str() {
+ CREATE_PLAYLIST_ITEM => popover.popup(),
+ _ => unimplemented!()
+ }
+ }
+ }
+ }));
+
+ Self {
+ listbox,
+ list_store,
+ model,
+ }
+ }
+
+ fn make_navigatable(item: &SidebarItem) -> gtk::Widget {
+ let row = SidebarRow::new(item.clone());
+ row.set_selectable(false);
+ row.upcast()
+ }
+
+ fn make_section_label(item: &SidebarItem) -> gtk::Widget {
+ let label = gtk::Label::new(Some(item.title().as_str()));
+ label.add_css_class("caption-heading");
+ let row = gtk::ListBoxRow::builder()
+ .activatable(false)
+ .selectable(false)
+ .sensitive(false)
+ .child(&label)
+ .build();
+ row.upcast()
+ }
+
+ fn make_create_playlist(item: &SidebarItem, popover: CreatePlaylistPopover) -> gtk::Widget {
+ let row = SidebarRow::new(item.clone());
+ row.set_activatable(true);
+ row.set_selectable(false);
+ row.set_sensitive(true);
+ popover.set_parent(&row);
+ row.upcast()
+ }
+
+ fn update_playlists_in_sidebar(&self) {
+ let playlists: Vec = self
+ .model
+ .get_playlists()
+ .into_iter()
+ .map(SidebarItem::from_destination)
+ .collect();
+ self.list_store.splice(
+ NUM_FIXED_ENTRIES,
+ self.list_store.n_items() - NUM_FIXED_ENTRIES,
+ playlists.as_slice(),
+ );
+ }
+}
+
+impl Component for Sidebar {
+ fn get_root_widget(&self) -> >k::Widget {
+ self.listbox.upcast_ref()
+ }
+}
+
+impl EventListener for Sidebar {
+ fn on_event(&mut self, event: &AppEvent) {
+ if let AppEvent::BrowserEvent(BrowserEvent::SavedPlaylistsUpdated) = event {
+ self.update_playlists_in_sidebar();
+ }
+ }
+}
diff --git a/src/app/components/sidebar/sidebar_item.rs b/src/app/components/sidebar/sidebar_item.rs
new file mode 100644
index 00000000..7213ae16
--- /dev/null
+++ b/src/app/components/sidebar/sidebar_item.rs
@@ -0,0 +1,168 @@
+use gettextrs::gettext;
+use glib::Properties;
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+
+use crate::app::models::PlaylistSummary;
+
+const LIBRARY: &str = "library";
+const SAVED_TRACKS: &str = "saved_tracks";
+const NOW_PLAYING: &str = "now_playing";
+const SAVED_PLAYLISTS: &str = "saved_playlists";
+const PLAYLIST: &str = "playlist";
+pub const SAVED_PLAYLISTS_SECTION: &str = "saved_playlists_section";
+pub const CREATE_PLAYLIST_ITEM: &str = "create_playlist";
+
+#[derive(Debug)]
+pub enum SidebarDestination {
+ Library,
+ SavedTracks,
+ NowPlaying,
+ SavedPlaylists,
+ Playlist(PlaylistSummary),
+}
+
+impl SidebarDestination {
+ pub fn id(&self) -> &'static str {
+ match self {
+ Self::Library => LIBRARY,
+ Self::SavedTracks => SAVED_TRACKS,
+ Self::NowPlaying => NOW_PLAYING,
+ Self::SavedPlaylists => SAVED_PLAYLISTS,
+ Self::Playlist(_) => PLAYLIST,
+ }
+ }
+
+ pub fn title(&self) -> String {
+ match self {
+ // translators: This is a sidebar entry to browse to saved albums.
+ Self::Library => gettext("Library"),
+ // translators: This is a sidebar entry to browse to saved tracks.
+ Self::SavedTracks => gettext("Saved tracks"),
+ // translators: This is a sidebar entry to browse to saved playlists.
+ Self::NowPlaying => gettext("Now playing"),
+ // translators: This is a sidebar entry that marks that the entries below are playlists.
+ Self::SavedPlaylists => gettext("Playlists"),
+ Self::Playlist(PlaylistSummary { title, .. }) => title.clone(),
+ }
+ }
+
+ pub fn icon(&self) -> &'static str {
+ match self {
+ Self::Library => "library-music-symbolic",
+ Self::SavedTracks => "starred-symbolic",
+ Self::NowPlaying => "music-queue-symbolic",
+ Self::SavedPlaylists => "view-app-grid-symbolic",
+ Self::Playlist(_) => "playlist2-symbolic",
+ }
+ }
+}
+
+impl SidebarItem {
+ pub fn from_destination(dest: SidebarDestination) -> Self {
+ let (id, data, title) = match dest {
+ SidebarDestination::Playlist(PlaylistSummary { id, title }) => {
+ (PLAYLIST, Some(id), title)
+ }
+ _ => (dest.id(), None, dest.title()),
+ };
+ glib::Object::builder()
+ .property("id", &id)
+ .property("data", &data.unwrap_or_default())
+ .property("title", &title)
+ .property("navigatable", &true)
+ .build()
+ }
+
+ pub fn playlists_section() -> Self {
+ glib::Object::builder()
+ .property("id", &SAVED_PLAYLISTS_SECTION)
+ .property("data", &String::new())
+ .property("title", &gettext("All Playlists"))
+ .property("navigatable", &false)
+ .build()
+ }
+
+ pub fn create_playlist_item() -> Self {
+ glib::Object::builder()
+ .property("id", &CREATE_PLAYLIST_ITEM)
+ .property("data", &String::new())
+ .property("title", &gettext("New Playlist"))
+ .property("navigatable", &false)
+ .build()
+ }
+
+ pub fn destination(&self) -> Option {
+ let navigatable = self.property::("navigatable");
+ if navigatable {
+ let id = self.id();
+ let data = self.property::("data");
+ let title = self.title();
+ match id.as_str() {
+ LIBRARY => Some(SidebarDestination::Library),
+ SAVED_TRACKS => Some(SidebarDestination::SavedTracks),
+ NOW_PLAYING => Some(SidebarDestination::NowPlaying),
+ SAVED_PLAYLISTS => Some(SidebarDestination::SavedPlaylists),
+ PLAYLIST => Some(SidebarDestination::Playlist(PlaylistSummary {
+ id: data,
+ title,
+ })),
+ _ => None,
+ }
+ } else {
+ None
+ }
+ }
+
+ pub fn icon(&self) -> Option<&str> {
+ match self.id().as_str() {
+ CREATE_PLAYLIST_ITEM => Some("list-add-symbolic"),
+ _ => self.destination().map(|d| d.icon()),
+ }
+ }
+}
+
+mod imp {
+ use super::*;
+ use gdk::cairo::glib::ParamSpec;
+ use std::cell::{Cell, RefCell};
+ use std::convert::TryFrom;
+
+ #[derive(Debug, Default, Properties)]
+ #[properties(wrapper_type = super::SidebarItem)]
+ pub struct SidebarItem {
+ #[property(get, set)]
+ pub id: RefCell,
+ #[property(get, set)]
+ pub data: RefCell,
+ #[property(get, set)]
+ pub title: RefCell,
+ #[property(get, set)]
+ pub navigatable: Cell,
+ }
+
+ #[glib::object_subclass]
+ impl ObjectSubclass for SidebarItem {
+ const NAME: &'static str = "SideBarItem";
+ type Type = super::SidebarItem;
+ type ParentType = glib::Object;
+ }
+
+ impl ObjectImpl for SidebarItem {
+ fn properties() -> &'static [ParamSpec] {
+ Self::derived_properties()
+ }
+
+ fn set_property(&self, id: usize, value: &glib::Value, pspec: &glib::ParamSpec) {
+ self.derived_set_property(id, value, pspec);
+ }
+
+ fn property(&self, id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+ self.derived_property(id, pspec)
+ }
+ }
+}
+
+glib::wrapper! {
+ pub struct SidebarItem(ObjectSubclass);
+}
diff --git a/src/app/components/sidebar/sidebar_row.rs b/src/app/components/sidebar/sidebar_row.rs
new file mode 100644
index 00000000..516a9415
--- /dev/null
+++ b/src/app/components/sidebar/sidebar_row.rs
@@ -0,0 +1,85 @@
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+use gtk::CompositeTemplate;
+
+use super::SidebarItem;
+
+impl SidebarRow {
+ pub fn new(item: SidebarItem) -> Self {
+ glib::Object::builder().property("item", item).build()
+ }
+}
+
+mod imp {
+ use super::*;
+ use glib::{ParamSpec, Properties};
+ use std::cell::RefCell;
+ use std::convert::TryFrom;
+
+ #[derive(Debug, CompositeTemplate, Properties)]
+ #[template(resource = "/dev/alextren/Spot/sidebar/sidebar_row.ui")]
+ #[properties(wrapper_type = super::SidebarRow)]
+ pub struct SidebarRow {
+ #[template_child]
+ pub icon: TemplateChild,
+
+ #[template_child]
+ pub title: TemplateChild,
+
+ #[property(get, set = Self::set_item)]
+ pub item: RefCell,
+ }
+
+ impl SidebarRow {
+ fn set_item(&self, item: SidebarItem) {
+ self.title.set_text(item.title().as_str());
+ self.icon.set_icon_name(item.icon());
+ self.obj().set_tooltip_text(Some(item.title().as_str()));
+ self.item.replace(item);
+ }
+ }
+
+ #[glib::object_subclass]
+ impl ObjectSubclass for SidebarRow {
+ const NAME: &'static str = "SidebarRow";
+ type Type = super::SidebarRow;
+ type ParentType = gtk::ListBoxRow;
+
+ fn class_init(klass: &mut Self::Class) {
+ klass.bind_template();
+ }
+
+ fn instance_init(obj: &glib::subclass::InitializingObject) {
+ obj.init_template();
+ }
+
+ fn new() -> Self {
+ Self {
+ icon: Default::default(),
+ title: Default::default(),
+ item: RefCell::new(glib::Object::new()),
+ }
+ }
+ }
+
+ impl ObjectImpl for SidebarRow {
+ fn properties() -> &'static [ParamSpec] {
+ Self::derived_properties()
+ }
+
+ fn set_property(&self, id: usize, value: &glib::Value, pspec: &glib::ParamSpec) {
+ self.derived_set_property(id, value, pspec);
+ }
+
+ fn property(&self, id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+ self.derived_property(id, pspec)
+ }
+ }
+
+ impl WidgetImpl for SidebarRow {}
+ impl ListBoxRowImpl for SidebarRow {}
+}
+
+glib::wrapper! {
+ pub struct SidebarRow(ObjectSubclass) @extends gtk::Widget, gtk::ListBoxRow;
+}
diff --git a/src/app/components/sidebar/sidebar_row.ui b/src/app/components/sidebar/sidebar_row.ui
new file mode 100644
index 00000000..da15c989
--- /dev/null
+++ b/src/app/components/sidebar/sidebar_row.ui
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/components/sidebar_listbox/mod.rs b/src/app/components/sidebar_listbox/mod.rs
deleted file mode 100644
index 960fe346..00000000
--- a/src/app/components/sidebar_listbox/mod.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-mod sidebar_icon_widget;
-mod sidebar_item;
-mod sidebar_row;
-
-use crate::app::components::display_add_css_provider;
-use gtk::prelude::*;
-use gtk::ListBox;
-pub use sidebar_item::*;
-pub use sidebar_row::*;
-
-pub fn build_sidebar_listbox(builder: >k::Builder, list_store: &gio::ListStore) -> ListBox {
- display_add_css_provider(resource!("/sidebar_listbox/sidebar.css"));
- let listbox: gtk::ListBox = builder.object("home_listbox").unwrap();
- listbox.bind_model(Some(list_store), move |obj| {
- let item = obj.downcast_ref::().unwrap();
- let row = SideBarRow::new(item);
- row.upcast::()
- });
- listbox.add_css_class("navigation-sidebar");
- listbox.add_css_class("listbox_sidebar");
- listbox
-}
diff --git a/src/app/components/sidebar_listbox/sidebar.css b/src/app/components/sidebar_listbox/sidebar.css
deleted file mode 100644
index bab390e3..00000000
--- a/src/app/components/sidebar_listbox/sidebar.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.item_sidebar {
- margin: 12px 6px;
-}
-
-.listbox_sidebar {
- background-color: @view_bg_color;
-}
\ No newline at end of file
diff --git a/src/app/components/sidebar_listbox/sidebar_icon_widget.rs b/src/app/components/sidebar_listbox/sidebar_icon_widget.rs
deleted file mode 100644
index 6be73f5b..00000000
--- a/src/app/components/sidebar_listbox/sidebar_icon_widget.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use gtk::prelude::*;
-use gtk::subclass::prelude::*;
-use gtk::CompositeTemplate;
-
-mod imp {
-
- use super::*;
-
- #[derive(Debug, Default, CompositeTemplate)]
- #[template(resource = "/dev/alextren/Spot/sidebar_listbox/sidebar_icon_widget.ui")]
- pub struct SideBarItemWidgetIcon {
- #[template_child]
- pub icon: TemplateChild,
-
- #[template_child]
- pub title: TemplateChild,
- }
-
- #[glib::object_subclass]
- impl ObjectSubclass for SideBarItemWidgetIcon {
- const NAME: &'static str = "SideBarItemWidgetIcon";
- type Type = super::SideBarItemWidgetIcon;
- type ParentType = gtk::Box;
-
- fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
- }
-
- fn instance_init(obj: &glib::subclass::InitializingObject) {
- obj.init_template();
- }
- }
-
- impl ObjectImpl for SideBarItemWidgetIcon {
- fn dispose(&self, obj: &Self::Type) {
- while let Some(child) = obj.first_child() {
- child.unparent();
- }
- }
- }
-
- impl WidgetImpl for SideBarItemWidgetIcon {}
- impl BoxImpl for SideBarItemWidgetIcon {}
-}
-
-glib::wrapper! {
- pub struct SideBarItemWidgetIcon(ObjectSubclass) @extends gtk::Widget, gtk::Box;
-}
-
-impl SideBarItemWidgetIcon {
- pub fn new(title: &str, iconname: Option<&str>) -> Self {
- let s: SideBarItemWidgetIcon =
- glib::Object::new(&[]).expect("Failed to create an instance of SideBarItemWidgetIcon");
- s.widget().title.set_text(title);
- s.widget().icon.set_icon_name(iconname);
- s.set_tooltip_text(Option::from(title));
- s
- }
-
- pub fn widget(&self) -> &imp::SideBarItemWidgetIcon {
- imp::SideBarItemWidgetIcon::from_instance(self)
- }
-}
diff --git a/src/app/components/sidebar_listbox/sidebar_icon_widget.ui b/src/app/components/sidebar_listbox/sidebar_icon_widget.ui
deleted file mode 100644
index cdab7115..00000000
--- a/src/app/components/sidebar_listbox/sidebar_icon_widget.ui
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- True
- 12
-
-
-
-
-
-
-
-
diff --git a/src/app/components/sidebar_listbox/sidebar_item.rs b/src/app/components/sidebar_listbox/sidebar_item.rs
deleted file mode 100644
index 270fa0d1..00000000
--- a/src/app/components/sidebar_listbox/sidebar_item.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-use gtk::prelude::*;
-use gtk::subclass::prelude::*;
-
-impl SideBarItem {
- pub fn new(id: &str, title: &str, iconname: &str, grayedout: bool) -> SideBarItem {
- glib::Object::new::(&[
- ("id", &id),
- ("title", &title),
- ("iconname", &iconname),
- ("grayedout", &grayedout),
- ])
- .expect("Failed to create")
- }
-
- pub(crate) fn id(&self) -> String {
- self.property::("id")
- }
-
- pub(crate) fn title(&self) -> String {
- self.property::("title")
- }
-
- pub(crate) fn iconname(&self) -> String {
- self.property::("iconname")
- }
-
- pub(crate) fn grayedout(&self) -> bool {
- self.property::("grayedout")
- }
-}
-
-mod imp {
- use super::*;
- use gdk::cairo::glib::ParamSpec;
- use std::cell::RefCell;
-
- #[derive(Debug, Default)]
- pub struct SideBarItem {
- pub id: RefCell>,
- pub title: RefCell>,
- pub iconname: RefCell>,
- pub grayedout: RefCell,
- }
-
- #[glib::object_subclass]
- impl ObjectSubclass for SideBarItem {
- const NAME: &'static str = "SideBarItem";
- type Type = super::SideBarItem;
- type ParentType = glib::Object;
-
- fn new() -> Self {
- Self {
- id: RefCell::new(None),
- title: RefCell::new(None),
- iconname: RefCell::new(None),
- grayedout: RefCell::new(false),
- }
- }
- }
-
- lazy_static! {
- static ref PROPERTIES: [glib::ParamSpec; 4] = [
- glib::ParamSpecString::new("id", "ID", "", None, glib::ParamFlags::READWRITE),
- glib::ParamSpecString::new("title", "Title", "", None, glib::ParamFlags::READWRITE),
- glib::ParamSpecString::new(
- "iconname",
- "IconName",
- "",
- None,
- glib::ParamFlags::READWRITE
- ),
- glib::ParamSpecBoolean::new(
- "grayedout",
- "GrayedOut",
- "",
- false,
- glib::ParamFlags::READWRITE
- ),
- ];
- }
-
- impl ObjectImpl for SideBarItem {
- fn properties() -> &'static [ParamSpec] {
- &*PROPERTIES
- }
-
- fn set_property(
- &self,
- _obj: &Self::Type,
- _id: usize,
- value: &glib::Value,
- pspec: &glib::ParamSpec,
- ) {
- match pspec.name() {
- "id" => {
- let id = value
- .get()
- .expect("type conformity checked by `Object::set_property`");
- self.id.replace(id);
- }
- "title" => {
- let title = value
- .get()
- .expect("type conformity checked by `Object::set_property`");
- self.title.replace(title);
- }
- "iconname" => {
- let iconname = value
- .get()
- .expect("type conformity checked by `Object::set_property`");
- self.iconname.replace(iconname);
- }
- "grayedout" => {
- let grayedout = value
- .get()
- .expect("type conformity checked by `Object::set_property`");
- self.grayedout.replace(grayedout);
- }
- _ => unimplemented!(),
- }
- }
-
- fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
- match pspec.name() {
- "id" => self.id.borrow().to_value(),
- "title" => self.title.borrow().to_value(),
- "iconname" => self.iconname.borrow().to_value(),
- "grayedout" => self.grayedout.borrow().to_value(),
- _ => unimplemented!(),
- }
- }
- }
-}
-
-glib::wrapper! {
- pub struct SideBarItem(ObjectSubclass);
-}
diff --git a/src/app/components/sidebar_listbox/sidebar_row.rs b/src/app/components/sidebar_listbox/sidebar_row.rs
deleted file mode 100644
index c7d6d5c5..00000000
--- a/src/app/components/sidebar_listbox/sidebar_row.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use crate::app::components::display_add_css_provider;
-use crate::app::components::sidebar_listbox::sidebar_icon_widget::SideBarItemWidgetIcon;
-use crate::app::components::sidebar_listbox::SideBarItem;
-use gtk::prelude::*;
-use gtk::subclass::prelude::*;
-
-impl SideBarRow {
- pub fn new(item: &SideBarItem) -> SideBarRow {
- display_add_css_provider(resource!("/sidebar_listbox/sidebar.css"));
- let id = item.id();
- let t = item.title();
- let row =
- glib::Object::new::(&[("id", &id.as_str())]).expect("Failed to create");
- if item.grayedout() {
- let label = gtk::Label::new(Option::from(t.as_str()));
- let gtk_box = gtk::Box::new(gtk::Orientation::Horizontal, 12);
- gtk_box.append(&label);
- row.set_child(Option::from(>k_box));
- row.set_activatable(false);
- row.set_selectable(false);
- row.set_sensitive(false);
- label.add_css_class("caption-heading");
- label.add_css_class("item_sidebar");
- } else {
- let widget = SideBarItemWidgetIcon::new(t.as_str(), Some(item.iconname().as_str()));
- row.set_child(Option::from(&widget));
- }
- row
- }
-
- pub fn id(&self) -> String {
- self.property::("id")
- }
-}
-
-mod imp {
- use super::*;
- use gdk::cairo::glib::ParamSpec;
- use std::cell::RefCell;
-
- #[derive(Debug, Default)]
- pub struct SideBarRow {
- pub id: RefCell>,
- }
-
- #[glib::object_subclass]
- impl ObjectSubclass for SideBarRow {
- const NAME: &'static str = "SideBarRow";
- type Type = super::SideBarRow;
- type ParentType = gtk::ListBoxRow;
-
- fn new() -> Self {
- Self {
- id: RefCell::new(None),
- }
- }
- }
-
- lazy_static! {
- static ref PROPERTIES: [glib::ParamSpec; 1] = [glib::ParamSpecString::new(
- "id",
- "ID",
- "",
- None,
- glib::ParamFlags::READWRITE
- ),];
- }
-
- impl ObjectImpl for SideBarRow {
- fn properties() -> &'static [ParamSpec] {
- &*PROPERTIES
- }
-
- fn set_property(
- &self,
- _obj: &Self::Type,
- _id: usize,
- value: &glib::Value,
- pspec: &glib::ParamSpec,
- ) {
- match pspec.name() {
- "id" => {
- let id = value
- .get()
- .expect("type conformity checked by `Object::set_property`");
- self.id.replace(id);
- }
- _ => unimplemented!(),
- }
- }
-
- fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
- match pspec.name() {
- "id" => self.id.borrow().to_value(),
- _ => unimplemented!(),
- }
- }
- }
-
- impl WidgetImpl for SideBarRow {}
-
- impl ListBoxRowImpl for SideBarRow {}
-}
-glib::wrapper! {
- pub struct SideBarRow(ObjectSubclass) @extends gtk::Widget, gtk::ListBoxRow;
-}
diff --git a/src/app/components/user_details/user_details.rs b/src/app/components/user_details/user_details.rs
index 671ae894..392684c5 100644
--- a/src/app/components/user_details/user_details.rs
+++ b/src/app/components/user_details/user_details.rs
@@ -34,7 +34,7 @@ mod imp {
type ParentType = gtk::Box;
fn class_init(klass: &mut Self::Class) {
- Self::bind_template(klass);
+ klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject) {
@@ -54,24 +54,20 @@ glib::wrapper! {
impl UserDetailsWidget {
fn new() -> Self {
display_add_css_provider(resource!("/components/user_details.css"));
- glib::Object::new(&[]).expect("Failed to create an instance of UserDetailsWidget")
- }
-
- fn widget(&self) -> &imp::UserDetailsWidget {
- imp::UserDetailsWidget::from_instance(self)
+ glib::Object::new()
}
fn set_user_name(&self, name: &str) {
let context = self.style_context();
context.add_class("user__loaded");
- self.widget().user_name.set_text(name);
+ self.imp().user_name.set_text(name);
}
fn connect_bottom_edge(&self, f: F)
where
F: Fn() + 'static,
{
- self.widget()
+ self.imp()
.scrolled_window
.connect_edge_reached(move |_, pos| {
if let gtk::PositionType::Bottom = pos {
@@ -84,7 +80,7 @@ impl UserDetailsWidget {
where
F: Fn(String) + Clone + 'static,
{
- self.widget()
+ self.imp()
.user_playlists
.bind_model(Some(store.unsafe_store()), move |item| {
wrap_flowbox_item(item, |item: &AlbumModel| {
@@ -118,7 +114,7 @@ impl UserDetails {
if let Some(store) = model.get_list_store() {
widget.bind_user_playlists(
worker,
- &*store,
+ &store,
clone!(@weak model => move |uri| {
model.open_playlist(uri);
}),
diff --git a/src/app/components/user_menu/user_menu_model.rs b/src/app/components/user_menu/user_menu_model.rs
index c6b2f9b8..99dd39e3 100644
--- a/src/app/components/user_menu/user_menu_model.rs
+++ b/src/app/components/user_menu/user_menu_model.rs
@@ -1,6 +1,5 @@
use crate::api::clear_user_cache;
use crate::app::credentials::Credentials;
-use crate::app::models::{PlaylistDescription, PlaylistSummary};
use crate::app::state::{LoginAction, PlaybackAction};
use crate::app::{ActionDispatcher, AppModel};
use std::ops::Deref;
@@ -27,7 +26,7 @@ impl UserMenuModel {
pub fn logout(&self) {
self.dispatcher.dispatch(PlaybackAction::Stop.into());
self.dispatcher.dispatch_async(Box::pin(async {
- let _ = Credentials::logout();
+ let _ = Credentials::logout().await;
let _ = clear_user_cache().await;
Some(LoginAction::Logout.into())
}));
@@ -43,10 +42,7 @@ impl UserMenuModel {
let summaries = playlists
.into_iter()
.filter(|p| p.owner.id == current_user)
- .map(|PlaylistDescription { id, title, .. }| PlaylistSummary {
- id,
- title,
- })
+ .map(|p| p.into())
.collect();
LoginAction::SetUserPlaylists(summaries).into()
})
diff --git a/src/app/credentials.rs b/src/app/credentials.rs
index abba1344..50867f82 100644
--- a/src/app/credentials.rs
+++ b/src/app/credentials.rs
@@ -27,33 +27,46 @@ impl Credentials {
}
}
- pub fn retrieve() -> Result {
- let service = SecretService::new(EncryptionType::Dh)?;
- let collection = service.get_default_collection()?;
- let items = collection.search_items(make_attributes())?;
- let item = items.get(0).ok_or(Error::NoResult)?.get_secret()?;
- serde_json::from_slice(&item).map_err(|_| Error::Parse)
+ pub async fn retrieve() -> Result {
+ let service = SecretService::connect(EncryptionType::Dh).await?;
+ let collection = service.get_default_collection().await?;
+ if collection.is_locked().await? {
+ collection.unlock().await?;
+ }
+ let items = collection.search_items(make_attributes()).await?;
+ let item = items.get(0).ok_or(Error::NoResult)?.get_secret().await?;
+ serde_json::from_slice(&item).map_err(|_| Error::Unavailable)
}
- pub fn logout() -> Result<(), Error> {
- let service = SecretService::new(EncryptionType::Dh)?;
- let collection = service.get_default_collection()?;
- let result = collection.search_items(make_attributes())?;
- let item = result.get(0).ok_or(Error::NoResult)?;
- item.delete()
+ pub async fn logout() -> Result<(), Error> {
+ let service = SecretService::connect(EncryptionType::Dh).await?;
+ let collection = service.get_default_collection().await?;
+ if !collection.is_locked().await? {
+ let result = collection.search_items(make_attributes()).await?;
+ let item = result.get(0).ok_or(Error::NoResult)?;
+ item.delete().await
+ } else {
+ warn!("Keyring is locked -- not clearing credentials");
+ Ok(())
+ }
}
- pub fn save(&self) -> Result<(), Error> {
- let service = SecretService::new(EncryptionType::Dh)?;
- let collection = service.get_default_collection()?;
+ pub async fn save(&self) -> Result<(), Error> {
+ let service = SecretService::connect(EncryptionType::Dh).await?;
+ let collection = service.get_default_collection().await?;
+ if collection.is_locked().await? {
+ collection.unlock().await?;
+ }
let encoded = serde_json::to_vec(&self).unwrap();
- collection.create_item(
- "Spotify Credentials",
- make_attributes(),
- &encoded,
- true,
- "text/plain",
- )?;
+ collection
+ .create_item(
+ "Spotify Credentials",
+ make_attributes(),
+ &encoded,
+ true,
+ "text/plain",
+ )
+ .await?;
Ok(())
}
}
diff --git a/src/app/dispatch.rs b/src/app/dispatch.rs
index d22290af..c54774b7 100644
--- a/src/app/dispatch.rs
+++ b/src/app/dispatch.rs
@@ -8,6 +8,7 @@ use super::AppAction;
pub trait ActionDispatcher {
fn dispatch(&self, action: AppAction);
+ fn dispatch_many(&self, actions: Vec);
fn dispatch_local_async(&self, action: LocalBoxFuture<'static, Option>);
fn dispatch_async(&self, action: BoxFuture<'static, Option>);
fn dispatch_many_async(&self, actions: BoxFuture<'static, Vec>);
@@ -31,6 +32,12 @@ impl ActionDispatcher for ActionDispatcherImpl {
self.sender.unbounded_send(action).unwrap();
}
+ fn dispatch_many(&self, actions: Vec) {
+ for action in actions.into_iter() {
+ self.sender.unbounded_send(action).unwrap();
+ }
+ }
+
fn dispatch_local_async(&self, action: LocalBoxFuture<'static, Option>) {
let clone = self.sender.clone();
self.worker.send_local_task(async move {
@@ -81,8 +88,8 @@ impl DispatchLoop {
pub async fn attach(self, mut handler: impl FnMut(AppAction)) {
self.receiver
.for_each(|action| {
- let result = handler(action);
- async move { result }
+ handler(action);
+ async {}
})
.await;
}
diff --git a/src/app/list_store.rs b/src/app/list_store.rs
index 2dce499b..6b4aa929 100644
--- a/src/app/list_store.rs
+++ b/src/app/list_store.rs
@@ -28,6 +28,11 @@ where
&self.store
}
+ pub fn prepend(&mut self, elements: impl Iterator