diff --git a/AUTHORS b/AUTHORS index b7d53764..10985ad3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -16,4 +16,5 @@ Nicolas Fella Fridolin Weisser Jan Przebor Warren Hu -bbb651 \ No newline at end of file +bbb651 +Julius Rüberg \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index b632f01c..6b596c77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2951,7 +2951,7 @@ dependencies = [ [[package]] name = "spot" -version = "0.3.2" +version = "0.3.3" dependencies = [ "async-std", "env_logger 0.9.0", diff --git a/Cargo.toml b/Cargo.toml index f5058235..eea8be79 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spot" -version = "0.3.2" +version = "0.3.3" edition = "2018" license = "MIT" diff --git a/README.md b/README.md index a5c2b171..89042e19 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,7 @@ Based on [librespot](https://github.com/librespot-org/librespot/). ## Installing -| Package | Maintainer | Repo | -| ------- | ---------- | ---- | -| Download on Flathub | xou816 | https://github.com/flathub/dev.alextren.Spot | -| Get it from the Snap Store | popey | https://github.com/popey/spot-snap | -| AUR version | dpeukert | https://gitlab.com/dpeukert/pkgbuilds/tree/main/spot-client | - +Download on Flathub ## Usage notes diff --git a/data/dev.alextren.Spot.appdata.xml b/data/dev.alextren.Spot.appdata.xml index b3e399db..069cbe4f 100644 --- a/data/dev.alextren.Spot.appdata.xml +++ b/data/dev.alextren.Spot.appdata.xml @@ -50,6 +50,17 @@ https://raw.githubusercontent.com/xou816/spot/master/data/appstream/3.png + + +

+ What's new: +

+ + +

diff --git a/meson.build b/meson.build index e1d6d9d3..0b45e13c 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'spot', - version: '0.3.2', + version: '0.3.3', meson_version: '>= 0.50.0', default_options: ['warning_level=2', 'buildtype=release'], ) diff --git a/po/fr.po b/po/fr.po index 758df8a2..79c00644 100644 --- a/po/fr.po +++ b/po/fr.po @@ -259,97 +259,97 @@ msgstr "{} de {}" #: src/app/components/navigation/home.rs:32 msgid "Unnamed playlist" -msgstr "" +msgstr "Liste de lecture sans titre" #. translators: This is a sidebar entry to browse to saved playlists. #: src/app/components/navigation/home.rs:104 msgid "All Playlists" -msgstr "" +msgstr "Toutes les listes de lecture" #: src/app/components/selection/component.rs:66 msgid "Tracks saved!" -msgstr "" +msgstr "Pistes enregistrées !" #. translators: This is a menu entry. #: src/app/components/user_menu/user_menu.rs:65 msgid "Preferences" -msgstr "" +msgstr "Préférences" #: src/main.rs:81 msgid "Failed to open link!" -msgstr "" +msgstr "Échec de l'ouverture du lien." #. 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 "Gestionnaire de l'audio" #. Title for an item in preferences #: src/app/components/settings/settings.ui:29 msgid "ALSA Device" -msgstr "" +msgstr "Appareil 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 "Ne s'applique que si ALSA est sélectionné" #. Title for an item in preferences #: src/app/components/settings/settings.ui:40 msgid "Audio Quality" -msgstr "" +msgstr "Qualité du flux audio" #: src/app/components/settings/settings.ui:44 msgid "Normal" -msgstr "" +msgstr "Normale" #: src/app/components/settings/settings.ui:45 msgid "High" -msgstr "" +msgstr "Élevée" #: src/app/components/settings/settings.ui:46 msgid "Very high" -msgstr "" +msgstr "Très élevée" #. Header for a group of preference items regarding the application's appearance #: src/app/components/settings/settings.ui:56 msgid "Appearance" -msgstr "" +msgstr "Apparence" #. Title for an item in preferences #: src/app/components/settings/settings.ui:59 msgid "Theme" -msgstr "" +msgstr "Thème" #: src/app/components/settings/settings.ui:63 msgid "Light" -msgstr "" +msgstr "Clair" #: src/app/components/settings/settings.ui:64 msgid "Dark" -msgstr "" +msgstr "Sombre" #. Header for a group of preference items regarding network #: src/app/components/settings/settings.ui:74 msgid "Network" -msgstr "" +msgstr "Réseau" #. Title for an item in preferences #: src/app/components/settings/settings.ui:77 msgid "Access Point Port" -msgstr "" +msgstr "Port du point d'accès" #. Longer description for an item (Access Point Port) in preferences #: src/app/components/settings/settings.ui:78 msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine." -msgstr "" +msgstr "Port utilisé pour se connecter au point d'accès de Spotify. Laisser la valeur à 0 pour gérer ce paramètre automatiquement. " #: src/app/components/selection/selection_toolbar.ui:90 msgid "Save to library" -msgstr "" +msgstr "Enregistrer dans la bibliothèque" diff --git a/po/pl.po b/po/pl.po index 8c43a628..46a8aba1 100644 --- a/po/pl.po +++ b/po/pl.po @@ -32,7 +32,7 @@ msgstr "Usuń z kolejki" #. 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 "Dodaj do" +msgstr "Dodaj do {}" #. 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 diff --git a/po/spot.pot b/po/spot.pot index fbd6f1aa..b9fd689b 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-13 13:00-0400\n" +"POT-Creation-Date: 2022-03-28 00:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -300,27 +300,22 @@ 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 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 information is shown when Caps Lock is enabled. -#: src/app/components/login/login.ui:95 -msgid "Caps Lock is enabled!" -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 "" diff --git a/src/app/components/login/login.rs b/src/app/components/login/login.rs index 63b894ca..ae6e4a29 100644 --- a/src/app/components/login/login.rs +++ b/src/app/components/login/login.rs @@ -30,9 +30,6 @@ mod imp { #[template_child] pub login_button: TemplateChild, - #[template_child] - pub caps_lock_info_container: TemplateChild, - #[template_child] pub auth_error_container: TemplateChild, } @@ -87,8 +84,7 @@ impl LoginWindow { let controller = gtk::EventControllerKey::new(); controller.set_propagation_phase(gtk::PropagationPhase::Capture); controller.connect_key_pressed( - clone!(@weak self as _self => @default-return gtk::Inhibit(false), move |_, key, _, modifier| { - _self.show_caps_lock_info((modifier == gdk::ModifierType::LOCK_MASK) ^ (key == gdk::Key::Caps_Lock)); + clone!(@weak self as _self => @default-return gtk::Inhibit(false), move |_, key, _, _| { if key == gdk::Key::Return { _self.submit(&on_submit_clone); gtk::Inhibit(true) @@ -111,11 +107,6 @@ impl LoginWindow { widget.auth_error_container.set_reveal_child(shown); } - fn show_caps_lock_info(&self, shown: bool) { - let widget = imp::LoginWindow::from_instance(self); - widget.caps_lock_info_container.set_reveal_child(shown); - } - fn submit(&self, on_submit: &SubmitFn) where SubmitFn: Fn(&str, &str), diff --git a/src/app/components/login/login.ui b/src/app/components/login/login.ui index 6633a940..9175b67d 100644 --- a/src/app/components/login/login.ui +++ b/src/app/components/login/login.ui @@ -59,50 +59,38 @@ vertical 4 - - avatar-default-symbolic - Username + + horizontal + 4 + + + avatar-default-symbolic + + + + + Username + + - - 0 - ● - dialog-password-symbolic - Password - - - - - - - 1 - slide-up - - 8 + horizontal + 4 - - center - start - 2 - 1 - dialog-information-symbolic + + dialog-password-symbolic - - Caps Lock is enabled! - 1 - 0 - 0 - - - - + + 1 + Password + - + @@ -154,4 +142,4 @@ - \ No newline at end of file +