diff --git a/README.md b/README.md index 6edd7ce..138d1b4 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,10 @@ [![Proudly part of GNOME Circle](https://circle.gnome.org/assets/button/badge.svg)](https://circle.gnome.org) [![Please do not theme this app](https://stopthemingmy.app/badge.svg)](https://stopthemingmy.app) -How was that chord played, again? Fretboard lets you find guitar chords -by typing their names or plotting them on an interactive guitar neck. -When you have identified a chord, you can experiment with changing it, -see more ways to play it, or bookmark it to save it for later. No matter -if you are a beginner or an advanced guitarist, you can use Fretboard to -practice, learn, and master your favorite songs! - ![screenshot](/data/screenshots/screenshot-1.png) +How was that chord played, again? Fretboard lets you find guitar chords by typing their names or plotting them on an interactive guitar neck. When you have identified a chord, you can experiment with changing it, see more ways to play it, or bookmark it to save it for later. No matter if you are a beginner or an advanced guitarist, you can use Fretboard to practice, learn, and master your favorite songs! + ## Installation Fretboard is available on Flathub. @@ -38,12 +33,3 @@ Please take this into consideration as well: - This project follows the [GNOME Code of Conduct](https://conduct.gnome.org). - Only Flatpak is officially supported. - If you want to contribute major changes, please discuss them beforehand to verify that they are suitable for the project. - -## Roadmap - -- [ ] Richer chord information (notes used, etc.) - -## Credits - -The original chord data is borrowed from T-vK's [Chord Collection](https://github.com/t-vK/chord-collection). I've modified it to fit the needs of this app better. - diff --git a/data/dev.bragefuglseth.Fretboard.metainfo.xml.in.in b/data/dev.bragefuglseth.Fretboard.metainfo.xml.in.in index 0ef2709..7a39a9e 100644 --- a/data/dev.bragefuglseth.Fretboard.metainfo.xml.in.in +++ b/data/dev.bragefuglseth.Fretboard.metainfo.xml.in.in @@ -64,6 +64,19 @@ @app-id@.desktop + + +

Enjoy practicing some tunes for the summer with this fresh batch of improvements:

+
    +
  • Better name predictions when drawing chords on the diagram
    • +
  • Note names shown on hover for the neck top toggles, regardless of whether they’re open or muted
    • +
  • Reliable updates of note names when moving up and down the neck
    • +
  • Catalan, Japanese, and Hindi translations, making Fretboard available in a total of 21 languages
    • +
+

As always, this update was made possible by volunteer bug reporters, developers, and translators. If you would like to come with suggestions, report bugs, translate the app, or contribute otherwise, feel free to reach out!

+ + +

This update improves the translations of Fretboard into other languages.

diff --git a/meson.build b/meson.build index 6b146f7..99e3cfb 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('fretboard', 'rust', - version: '6.1', + version: '7.0', license: 'GPL-3.0-or-later', meson_version: '>= 0.62.0', ) diff --git a/src/application.rs b/src/application.rs index 7bfb660..68cc055 100644 --- a/src/application.rs +++ b/src/application.rs @@ -21,7 +21,6 @@ use crate::FretboardWindow; use adw::prelude::*; use adw::subclass::prelude::*; -use gettextrs::gettext; use gtk::{gio, glib}; mod imp { @@ -88,10 +87,7 @@ impl FretboardApplication { let quit_action = gio::ActionEntry::builder("quit") .activate(move |app: &Self, _, _| app.quit()) .build(); - let about_action = gio::ActionEntry::builder("about") - .activate(move |app: &Self, _, _| app.show_about()) - .build(); - self.add_action_entries([quit_action, about_action]); + self.add_action_entries([quit_action]); self.set_accels_for_action("app.quit", &["q"]); self.set_accels_for_action("window.close", &["W"]); @@ -102,18 +98,4 @@ impl FretboardApplication { self.set_accels_for_action("win.bookmark-chord", &["D"]); self.set_accels_for_action("win.bookmarks", &["D"]); } - - fn show_about(&self) { - let about = adw::AboutDialog::from_appdata( - "/dev/bragefuglseth/Fretboard/dev.bragefuglseth.Fretboard.metainfo.xml", - Some("6.0"), - ); - - about.set_developers(&["Brage Fuglseth https://bragefuglseth.dev"]); - about.set_copyright("© 2024 Brage Fuglseth"); - // Translators: Replace "translator-credits" with your names, one name per line - about.set_translator_credits(&gettext("translator-credits")); - - about.present(&self.active_window().unwrap()); - } } diff --git a/src/widgets/window.blp b/src/widgets/window.blp index e4b8528..4a1840c 100644 --- a/src/widgets/window.blp +++ b/src/widgets/window.blp @@ -268,7 +268,7 @@ menu primary_menu { item { label: _("_About Fretboard"); - action: "app.about"; + action: "win.about"; } } } diff --git a/src/widgets/window.rs b/src/widgets/window.rs index 43b1ba0..63ce6c1 100644 --- a/src/widgets/window.rs +++ b/src/widgets/window.rs @@ -125,6 +125,9 @@ mod imp { klass.install_action("win.bookmark-chord", None, move |win, _, _| { win.bookmark_chord(); }); + klass.install_action("win.about", None, move |win, _, _| { + win.show_about_dialog(); + }); klass.bind_template(); } @@ -661,6 +664,20 @@ impl FretboardWindow { imp.navigation_stack.push_by_tag("bookmarks"); } + + fn show_about_dialog(&self) { + let about = adw::AboutDialog::from_appdata( + "/dev/bragefuglseth/Fretboard/dev.bragefuglseth.Fretboard.metainfo.xml", + Some("7.0"), + ); + + about.set_developers(&["Brage Fuglseth https://bragefuglseth.dev"]); + about.set_copyright("© 2024 Brage Fuglseth"); + // Translators: Replace "translator-credits" with your names, one name per line + about.set_translator_credits(&gettext("translator-credits")); + + about.present(self.root().unwrap().downcast_ref::().unwrap()); + } } fn chord_data_path() -> PathBuf {