Implement Search

theCheeseboard · Jul 29, 2024 · b6cf977 · b6cf977
1 parent 680825d
commit b6cf977
Show file tree

Hide file tree

Showing 15 changed files with 111 additions and 17 deletions.
diff --git a/application/ControlStrip.qml b/application/ControlStrip.qml
@@ -57,6 +57,7 @@ Layer {
             }
 
             Button {
+                Layout.alignment: Qt.AlignCenter
                 id: shuffleButton
                 flat: true
                 icon.name: "media-playlist-shuffle"
@@ -68,6 +69,7 @@ Layer {
                 }
             }
             Button {
+                Layout.alignment: Qt.AlignCenter
                 id: repeatOneButton
                 flat: true
                 icon.name: "media-repeat-single"
@@ -79,6 +81,7 @@ Layer {
                 }
             }
             Button {
+                Layout.alignment: Qt.AlignCenter
                 flat: true
                 icon.name: "media-skip-backward"
                 implicitWidth: height
@@ -87,17 +90,19 @@ Layer {
                 }
             }
             Button {
+                Layout.alignment: Qt.AlignCenter
                 id: playPauseButton
                 flat: true
                 icon.name: PlaylistManager.state === PlaylistManager.Playing ? "media-playback-pause" : "media-playback-start"
-                icon.height: 32
-                icon.width: 32
+                icon.height: 40
+                icon.width: 40
                 implicitWidth: height
                 onClicked: () => {
                     PlaylistManager.playPause();
                 }
             }
             Button {
+                Layout.alignment: Qt.AlignCenter
                 flat: true
                 icon.name: "media-skip-forward"
                 implicitWidth: height

diff --git a/application/TracksPane.qml b/application/TracksPane.qml
@@ -26,27 +26,44 @@ Item {
         color: layer1.color
     }
 
-    LibraryModel {
-        id: model
-    }
-
     Pager {
         anchors.top: grandstand.bottom
-        anchors.topMargin: 6
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.bottom: parent.bottom
-        anchors.bottomMargin: SafeZone.bottom
 
         currentAnimation: Pager.Fade
 
-        LibraryListing {
+        ColumnLayout {
             anchors.fill: parent
-            id: trackList
+
+            TextField {
+                id: searchBox
+                Layout.fillWidth: true
+                placeholderText: qsTr("Search")
+
+                background: Rectangle {
+                    implicitHeight: 40
+                    color: Contemporary.background
+                }
+
+                z: 1
+            }
+
+            LibraryListing {
+                id: trackList
+                Layout.fillHeight: true
+                Layout.fillWidth: true
+            }
         }
     }
 
     Component.onCompleted: () => {
-        trackList.model = LibraryManager.allTracks()
+        trackList.model = Qt.binding(() => {
+            if (searchBox.text !== "") {
+                return LibraryManager.searchTracks(searchBox.text);
+            }
+            return LibraryManager.allTracks();
+        });
     }
 }
diff --git a/application/library/librarymanager.h b/application/library/librarymanager.h
@@ -58,14 +58,14 @@ class LibraryManager : public QObject {
         int trackPlayCount(QString path);
 
         Q_SCRIPTABLE LibraryModel* allTracks();
-        LibraryModel* searchTracks(QString query);
-        int countTracks();
+        Q_SCRIPTABLE LibraryModel* searchTracks(QString query);
+        Q_SCRIPTABLE int countTracks();
 
-        QStringList artists();
-        QStringList albums();
+        Q_SCRIPTABLE QStringList artists();
+        Q_SCRIPTABLE QStringList albums();
 
-        LibraryModel* tracksByArtist(QString artist);
-        LibraryModel* tracksByAlbum(QString album);
+        Q_SCRIPTABLE LibraryModel* tracksByArtist(QString artist);
+        Q_SCRIPTABLE LibraryModel* tracksByAlbum(QString album);
 
         int createPlaylist(QString playlistName);
         QList<QPair<int, QString>> playlists();

diff --git a/application/translations/ar_SA.ts b/application/translations/ar_SA.ts
@@ -1088,6 +1088,12 @@ theBeat ستتم إعادة التشغيل بمجرد اكتمال إعادة ا
         <source>Tracks in Library</source>
         <translation type="unfinished">المسارات في المكتبة</translation>
     </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../../../build-theBeat-Desktop_ARM-Debug/application/com/vicr123/thebeat/TracksPane.qml" line="+18"/>
+        <source>Search</source>
+        <translation type="unfinished">بحث</translation>
+    </message>
 </context>
 <context>
     <name>TracksWidget</name>

diff --git a/application/translations/cs.ts b/application/translations/cs.ts
@@ -954,6 +954,12 @@ theBeat will restart once the reset is complete. This action is irreversible.</s
         <source>Tracks in Library</source>
         <translation type="unfinished">Stopy v knihovně</translation>
     </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../../../build-theBeat-Desktop_ARM-Debug/application/com/vicr123/thebeat/TracksPane.qml" line="+18"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TracksWidget</name>

diff --git a/application/translations/da_DK.ts b/application/translations/da_DK.ts
@@ -1060,6 +1060,12 @@ theBeat vil genstarte når nulstillingen er færdig. Dette kan ikke fortrydes.</
         <source>Tracks in Library</source>
         <translation type="unfinished">Sange i bibliotek</translation>
     </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../../../build-theBeat-Desktop_ARM-Debug/application/com/vicr123/thebeat/TracksPane.qml" line="+18"/>
+        <source>Search</source>
+        <translation type="unfinished">Søg</translation>
+    </message>
 </context>
 <context>
     <name>TracksWidget</name>

diff --git a/application/translations/de_DE.ts b/application/translations/de_DE.ts
@@ -1064,6 +1064,12 @@ theBeat wird nach dem beenden des Vorganges neustarten. Dieser Vorgang ist irrev
         <source>Tracks in Library</source>
         <translation type="unfinished">Titel in der Bibliothek</translation>
     </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../../../build-theBeat-Desktop_ARM-Debug/application/com/vicr123/thebeat/TracksPane.qml" line="+18"/>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
 </context>
 <context>
     <name>TracksWidget</name>

diff --git a/application/translations/en_GB.ts b/application/translations/en_GB.ts
@@ -1060,6 +1060,12 @@ theBeat will restart once the reset is complete. This action is irreversible.</t
         <source>Tracks in Library</source>
         <translation type="unfinished">Tracks in Library</translation>
     </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../../../build-theBeat-Desktop_ARM-Debug/application/com/vicr123/thebeat/TracksPane.qml" line="+18"/>
+        <source>Search</source>
+        <translation type="unfinished">Search</translation>
+    </message>
 </context>
 <context>
     <name>TracksWidget</name>

diff --git a/application/translations/en_US.ts b/application/translations/en_US.ts
@@ -922,6 +922,12 @@ theBeat will restart once the reset is complete. This action is irreversible.</s
         <source>Tracks in Library</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../../../build-theBeat-Desktop_ARM-Debug/application/com/vicr123/thebeat/TracksPane.qml" line="+18"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TracksWidget</name>

diff --git a/application/translations/fr_CA.ts b/application/translations/fr_CA.ts
@@ -955,6 +955,12 @@ theBeat will restart once the reset is complete. This action is irreversible.</s
         <source>Tracks in Library</source>
         <translation type="unfinished">Pistes dans la Biblio</translation>
     </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../../../build-theBeat-Desktop_ARM-Debug/application/com/vicr123/thebeat/TracksPane.qml" line="+18"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TracksWidget</name>

diff --git a/application/translations/id_ID.ts b/application/translations/id_ID.ts
@@ -1054,6 +1054,12 @@ theBeat akan restart seusai penyetelan ulang. Aksi ini tidak dapat dikembalikan.
         <source>Tracks in Library</source>
         <translation type="unfinished">Trek dalam Pustaka</translation>
     </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../../../build-theBeat-Desktop_ARM-Debug/application/com/vicr123/thebeat/TracksPane.qml" line="+18"/>
+        <source>Search</source>
+        <translation type="unfinished">Cari</translation>
+    </message>
 </context>
 <context>
     <name>TracksWidget</name>

diff --git a/application/translations/nl_NL.ts b/application/translations/nl_NL.ts
@@ -1056,6 +1056,12 @@ theBeat zal opnieuw starten zodra de reset klaar is. Deze actie is niet terug te
         <source>Tracks in Library</source>
         <translation type="unfinished">Nummers in Bibliotheek</translation>
     </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../../../build-theBeat-Desktop_ARM-Debug/application/com/vicr123/thebeat/TracksPane.qml" line="+18"/>
+        <source>Search</source>
+        <translation type="unfinished">Zoeken</translation>
+    </message>
 </context>
 <context>
     <name>TracksWidget</name>

diff --git a/application/translations/tr_TR.ts b/application/translations/tr_TR.ts
@@ -1058,6 +1058,12 @@ Sıfırlama tamamlandığında theBeat yeniden başlayacaktır. Bu eylem geri al
         <source>Tracks in Library</source>
         <translation type="unfinished">Kitaplıktaki Şarkılar</translation>
     </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../../../build-theBeat-Desktop_ARM-Debug/application/com/vicr123/thebeat/TracksPane.qml" line="+18"/>
+        <source>Search</source>
+        <translation type="unfinished">Ara</translation>
+    </message>
 </context>
 <context>
     <name>TracksWidget</name>

diff --git a/application/translations/ur_PK.ts b/application/translations/ur_PK.ts
@@ -945,6 +945,12 @@ theBeat will restart once the reset is complete. This action is irreversible.</s
         <source>Tracks in Library</source>
         <translation type="unfinished">لائبریری میں پٹریوں</translation>
     </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../../../build-theBeat-Desktop_ARM-Debug/application/com/vicr123/thebeat/TracksPane.qml" line="+18"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TracksWidget</name>

diff --git a/application/translations/vi_VN.ts b/application/translations/vi_VN.ts
@@ -1064,6 +1064,12 @@ theBeat sẽ khởi chạy lại sau khi việc đặt lại hoàn tất. Hoạt
         <source>Tracks in Library</source>
         <translation type="unfinished">Bài hát trong thư viện</translation>
     </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../../../build-theBeat-Desktop_ARM-Debug/application/com/vicr123/thebeat/TracksPane.qml" line="+18"/>
+        <source>Search</source>
+        <translation type="unfinished">Tìm kiếm</translation>
+    </message>
 </context>
 <context>
     <name>TracksWidget</name>