Temporarily removed broken audio element search functionality

PhilInTheGaps · Dec 6, 2023 · 28e07c2 · 28e07c2
1 parent 64e4849
commit 28e07c2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 52 deletions.
diff --git a/app/ui/tools/audio/AudioElementView.qml b/app/ui/tools/audio/AudioElementView.qml
@@ -124,6 +124,7 @@ Item {
 
     // Search
     Item {
+        visible: false // TODO: reimplement when element filter proxy model is implemented
         height: Sizes.toolbarHeight
         anchors.bottom: parent.bottom
         anchors.right: parent.right
@@ -186,7 +187,7 @@ Item {
                 }
             }
 
-            onTextChanged: AudioTool.findElement(text)
+            // onTextChanged: AudioTool.findElement(text)
 
             Keys.onEscapePressed: {
                 if (search_field.activeFocus) {

diff --git a/src/tools/audio/audiotool.cpp b/src/tools/audio/audiotool.cpp
@@ -332,13 +332,3 @@ void AudioTool::setMusicIndex(int index)
         musicPlayer.setIndex(index);
     }
 }
-
-void AudioTool::findElement(const QString &term) const
-{
-    AudioScenario::setFilterString(term);
-
-    if (currentProject() && currentProject()->currentCategory())
-    {
-        currentProject()->currentCategory()->refreshElements();
-    }
-}
diff --git a/src/tools/audio/audiotool.h b/src/tools/audio/audiotool.h
@@ -82,8 +82,6 @@ class AudioTool : public AbstractTool
     }
     void stop();
 
-    Q_INVOKABLE void findElement(const QString &term) const;
-
     // Meta Data
     [[nodiscard]] auto metaData() -> AudioMetaData *
     {

diff --git a/src/tools/audio/project/audiocategory.h b/src/tools/audio/project/audiocategory.h
@@ -50,10 +50,6 @@ class AudioCategory : public TreeItem
     auto deleteScenario(AudioScenario *scenario) -> bool;
 
     [[nodiscard]] auto elements() const -> QList<AudioElement *>;
-    void refreshElements()
-    {
-        if (m_currentScenario) m_currentScenario->refreshElements();
-    }
 
     READ_LIST_PROPERTY(AudioScenario, scenarios)
 

diff --git a/src/tools/audio/project/audioscenario.cpp b/src/tools/audio/project/audioscenario.cpp
@@ -143,16 +143,6 @@ auto AudioScenario::toJson() const -> QJsonObject
     return object;
 }
 
-void AudioScenario::refreshElements()
-{
-    emit elementsChanged();
-
-    foreach (auto *scenario, a_scenarios)
-    {
-        scenario->refreshElements();
-    }
-}
-
 void AudioScenario::onScenariosChanged()
 {
     updateModel();
@@ -166,26 +156,13 @@ auto AudioScenario::elements(bool recursive) const -> QList<AudioElement *>
 {
     QList<AudioElement *> list;
 
-    if (filterString.isEmpty())
-    {
-        if (!recursive)
-        {
-            return m_elements;
-        }
-
-        list.append(m_elements);
-    }
-    else
+    if (!recursive)
     {
-        foreach (auto *element, m_elements)
-        {
-            if (element->name().contains(filterString, Qt::CaseInsensitive))
-            {
-                list.push_back(element);
-            }
-        }
+        return m_elements;
     }
 
+    list.append(m_elements);
+
     if (recursive)
     {
         foreach (auto *scenario, a_scenarios)

diff --git a/src/tools/audio/project/audioscenario.h b/src/tools/audio/project/audioscenario.h
@@ -54,12 +54,6 @@ class AudioScenario : public TreeItem
     auto moveScenario(AudioScenario *scenario, int steps) -> bool;
     [[nodiscard]] auto containsScenario(const QString &name) const -> bool;
 
-    static void setFilterString(const QString &filter)
-    {
-        filterString = filter;
-    }
-    void refreshElements();
-
     READ_LIST_PROPERTY(AudioScenario, scenarios)
     READ_LIST_PROPERTY(AudioScenario, model)
     AUTO_PROPERTY_VAL2(bool, isSubscenario, false)
@@ -76,8 +70,6 @@ private slots:
                            const QList<AudioScenario *> &scenarios, bool isSubscenario, QObject *parent);
     explicit AudioScenario(const QJsonObject &object, const QString &path, bool isSubscenario, QObject *parent);
 
-    inline static QString filterString = QLatin1String();
-
     QString m_path;
 
     QList<AudioElement *> m_elements;