algorithm: support more chords

bragefuglseth · Feb 27, 2024 · 689370a · 689370a
1 parent 77c93e3
commit 689370a
Show file tree

Hide file tree

Showing 21 changed files with 758 additions and 588 deletions.
diff --git a/data/fretboard.gresource.xml.in b/data/fretboard.gresource.xml.in
@@ -10,6 +10,7 @@
     <file preprocess="xml-stripblanks" alias="library-symbolic.svg">icons/library-symbolic.svg</file>
     <file preprocess="xml-stripblanks" alias="star-outline-rounded-symbolic.svg">icons/star-outline-rounded-symbolic.svg</file>
     <file preprocess="xml-stripblanks" alias="star-large-symbolic.svg">icons/star-large-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="fretboard-symbolic.svg">icons/dev.bragefuglseth.Fretboard-symbolic.svg</file>
   </gresource>
 
   <gresource prefix="/dev/bragefuglseth/Fretboard">

diff --git a/data/gtk/help-overlay.blp b/data/gtk/help-overlay.blp
@@ -11,11 +11,13 @@ ShortcutsWindow help_overlay {
       title: _("General");
 
       ShortcutsShortcut {
+        // translators: "Empty" is a verb
         title: _("Empty Chord");
         action-name: "win.empty-chord";
       }
 
       ShortcutsShortcut {
+        // translators: "Bookmark" is a verb
         title: _("Bookmark Chord");
         action-name: "win.bookmark-chord";
       }
@@ -31,12 +33,13 @@ ShortcutsWindow help_overlay {
       }
 
       ShortcutsShortcut {
+        // translators: "Focus" is a verb
         title: _("Focus Entry");
         action-name: "win.focus-entry";
       }
 
       ShortcutsShortcut {
-        title: _("Show Shortcuts");
+        title: _("View Shortcuts");
         action-name: "win.show-help-overlay";
       }
 

diff --git a/data/gtk/window.blp b/data/gtk/window.blp
@@ -143,31 +143,50 @@ template $FretboardWindow : Adw.ApplicationWindow {
     Adw.NavigationPage variants_page {
       title: "";
       tag: "more-variants";
-      child: 
+      child:
       Adw.ToolbarView {
 
         [top]
         Adw.HeaderBar {}
 
-        content: ScrolledWindow variants_scrolled_window {
-          hscrollbar-policy: never;
+        content: Stack variants_stack {
+          StackPage {
+            name: "no-variants";
 
-          Adw.Clamp {
-            maximum-size: 1000;
-            tightening-threshold: 700;
-            unit: px;
+            child: Adw.StatusPage no_variants_page {
+              icon-name: "fretboard-symbolic";
+              title: _("No Variants");
+            }
 
-            FlowBox variants_container {
-              selection-mode: none;
-              homogeneous: true;
-              margin-top: 12;
-              margin-bottom: 24;
-              margin-start: 24;
-              margin-end: 24;
-              row-spacing: 12;
-              column-spacing: 12;
-              valign: start;
+            ;
+          }
+
+          StackPage {
+            name: "variants";
+
+            child: ScrolledWindow variants_scrolled_window {
+              hscrollbar-policy: never;
+
+              Adw.Clamp {
+                maximum-size: 1000;
+                tightening-threshold: 700;
+                unit: px;
+
+                FlowBox variants_container {
+                  selection-mode: none;
+                  homogeneous: true;
+                  margin-top: 12;
+                  margin-bottom: 24;
+                  margin-start: 24;
+                  margin-end: 24;
+                  row-spacing: 12;
+                  column-spacing: 12;
+                  valign: start;
+                }
+              }
             }
+
+            ;
           }
         }
 
@@ -235,6 +254,7 @@ menu primary_menu {
 
   section {
     item {
+      // translators: "Empty" is a verb
       label: _("_Empty Chord");
       action: "win.empty-chord";
     }

diff --git a/po/be.po b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fretboard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-01 23:20+0100\n"
+"POT-Creation-Date: 2024-02-27 22:22+0100\n"
 "PO-Revision-Date: 2024-01-08 22:06+0000\n"
 "Last-Translator: Yahor <k1llo2810@protonmail.com>\n"
 "Language-Team: Belarusian <https://hosted.weblate.org/projects/fretboard/"
@@ -25,19 +25,15 @@ msgid "Fretboard"
 msgstr "Fretboard"
 
 #: data/dev.bragefuglseth.Fretboard.desktop.in.in:4
-#: data/dev.bragefuglseth.Fretboard.metainfo.xml.in.in:9
+#: data/dev.bragefuglseth.Fretboard.metainfo.xml.in.in:13
 msgid "Look up guitar chords"
 msgstr "Знайдзіце акорды для гітары"
 
 #: data/dev.bragefuglseth.Fretboard.desktop.in.in:10
 msgid "guitar;chords"
 msgstr "guitar;chords;гітара; акорды"
 
-#: data/dev.bragefuglseth.Fretboard.metainfo.xml.in.in:8
-msgid "Brage Fuglseth"
-msgstr "Brage Fuglseth"
-
-#: data/dev.bragefuglseth.Fretboard.metainfo.xml.in.in:11
+#: data/dev.bragefuglseth.Fretboard.metainfo.xml.in.in:15
 msgid ""
 "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 "
@@ -54,7 +50,7 @@ msgstr ""
 "выкарыстоўваць Fretboard, каб практыкавацца, вучыцца і асвоіць свае любімыя "
 "песні!"
 
-#: data/dev.bragefuglseth.Fretboard.metainfo.xml.in.in:19
+#: data/dev.bragefuglseth.Fretboard.metainfo.xml.in.in:23
 msgid ""
 "Fretboard is proudly part of GNOME Circle, an initiative that champions the "
 "great software that is available for the GNOME platform. For more "
@@ -64,14 +60,6 @@ msgstr ""
 "падтрымлівае выдатнае праграмнае забеспячэнне, даступнае для платформы "
 "GNOME. Для атрымання дадатковай інфармацыі наведайце вэб-сайт GNOME Circle."
 
-#: data/dev.bragefuglseth.Fretboard.metainfo.xml.in.in:30
-msgid "guitar"
-msgstr "гітара"
-
-#: data/dev.bragefuglseth.Fretboard.metainfo.xml.in.in:31
-msgid "chords"
-msgstr "акорды"
-
 #. translators: "right-handed" and "left-handed" are enum values, and should not be translated
 #: data/dev.bragefuglseth.Fretboard.gschema.xml:16
 msgid "Can be either \"right-handed\"\" or \"left-handed\"."
@@ -102,36 +90,40 @@ msgstr "Энгарманічны эквівалент"
 msgid "General"
 msgstr "Агульныя"
 
-#: data/gtk/help-overlay.blp:14
+#. translators: "Empty" is a verb
+#: data/gtk/help-overlay.blp:15
 msgid "Empty Chord"
 msgstr "Ачысціць акорд"
 
-#: data/gtk/help-overlay.blp:19
+#. translators: "Bookmark" is a verb
+#: data/gtk/help-overlay.blp:21
 msgid "Bookmark Chord"
 msgstr "Дадаць у закладкі"
 
-#: data/gtk/help-overlay.blp:24
+#: data/gtk/help-overlay.blp:26
 msgid "View Bookmarks"
 msgstr "Закладкі"
 
-#: data/gtk/help-overlay.blp:29
+#: data/gtk/help-overlay.blp:31
 msgid "View Chord Variants"
 msgstr "Варыянты акорда"
 
-#: data/gtk/help-overlay.blp:34
+#. translators: "Focus" is a verb
+#: data/gtk/help-overlay.blp:37
 #, fuzzy
 msgid "Focus Entry"
 msgstr "Уваход у фокус"
 
-#: data/gtk/help-overlay.blp:39
-msgid "Show Shortcuts"
+#: data/gtk/help-overlay.blp:42
+#, fuzzy
+msgid "View Shortcuts"
 msgstr "Спалучэнні клавіш"
 
-#: data/gtk/help-overlay.blp:44
+#: data/gtk/help-overlay.blp:47
 msgid "Close Window"
 msgstr "Закрыць акно"
 
-#: data/gtk/help-overlay.blp:49
+#: data/gtk/help-overlay.blp:52
 msgid "Quit"
 msgstr "Выйсці"
 
@@ -147,31 +139,37 @@ msgstr "Акорд не знойдзены"
 msgid "View _Variants"
 msgstr "Праглядзець _варыянты"
 
-#: data/gtk/window.blp:181 src/window.rs:358
+#: data/gtk/window.blp:158
+#, fuzzy
+msgid "No Variants"
+msgstr "Праглядзець _варыянты"
+
+#: data/gtk/window.blp:200 src/window.rs:365
 msgid "Bookmarks"
 msgstr "Закладкі"
 
-#: data/gtk/window.blp:221
+#: data/gtk/window.blp:240
 msgid "Guitar Type"
 msgstr "Тып гітары"
 
-#: data/gtk/window.blp:224
+#: data/gtk/window.blp:243
 msgid "Right-handed"
 msgstr "Праўша"
 
-#: data/gtk/window.blp:230
+#: data/gtk/window.blp:249
 msgid "Left-handed"
 msgstr "Ляўша"
 
-#: data/gtk/window.blp:238
+#. translators: "Empty" is a verb
+#: data/gtk/window.blp:258
 msgid "_Empty Chord"
 msgstr "_Ачысціць акорд"
 
-#: data/gtk/window.blp:245
+#: data/gtk/window.blp:265
 msgid "_Keyboard Shortcuts"
 msgstr "_Спалучэнні клавіш"
 
-#: data/gtk/window.blp:250
+#: data/gtk/window.blp:270
 msgid "_About Fretboard"
 msgstr "_Аб праграме"
 
@@ -193,14 +191,23 @@ msgstr "Прыглушаны"
 msgid "Open"
 msgstr "Адкрыты"
 
-#: src/window.rs:286
+#: src/window.rs:290
 msgid "Remove Bookmark"
 msgstr "Выдаліць закладку"
 
-#: src/window.rs:288
+#: src/window.rs:292
 msgid "Bookmark"
 msgstr "Дадаць у закладкі"
 
-#: src/window.rs:356
+#: src/window.rs:363
 msgid "No Bookmarks"
 msgstr "Няма закладак"
+
+#~ msgid "Brage Fuglseth"
+#~ msgstr "Brage Fuglseth"
+
+#~ msgid "guitar"
+#~ msgstr "гітара"
+
+#~ msgid "chords"
+#~ msgstr "акорды"