Remove from filter model directly rather than through signals

mltframework · Oct 25, 2014 · a9e2a8c · a9e2a8c
1 parent 87d8150
commit a9e2a8c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/src/controllers/filtercontroller.cpp b/src/controllers/filtercontroller.cpp
@@ -37,6 +37,7 @@ FilterController::FilterController(QObject* parent) : QObject(parent),
     m_future = QtConcurrent::run(this, &FilterController::loadFilterMetadata);
 
     connect(&m_attachedModel, SIGNAL(changed()), this, SLOT(handleAttachedModelChange()));
+    connect(&m_attachedModel, SIGNAL(rowsAboutToBeRemoved(const QModelIndex&,int,int)), this, SLOT(handleAttachedRowsAboutToBeRemoved(const QModelIndex&,int,int)));
 }
 
 void FilterController::loadFilterMetadata() {
@@ -122,14 +123,6 @@ void FilterController::attachFilter(int metadataIndex)
     m_currentFilter.reset(filter);
 }
 
-void FilterController::removeFilter(int attachedIndex)
-{
-    QModelIndex index = m_attachedModel.index(attachedIndex);
-    if (index.isValid()) {
-        m_attachedModel.remove(index.row());
-    }
-}
-
 void FilterController::setCurrentFilter(int attachedIndex)
 {
     if( attachedIndex == m_currentFilterIndex ) {
@@ -191,6 +184,13 @@ void FilterController::handleAttachedModelChange()
     MLT.refreshConsumer();
 }
 
+void FilterController::handleAttachedRowsAboutToBeRemoved(const QModelIndex&, int first, int)
+{
+    if (m_currentFilterIndex >= first) {
+        setCurrentFilter(-1);
+    }
+}
+
 void FilterController::addMetadata(QmlMetadata* meta)
 {
     m_metadataModel.add(meta);

diff --git a/src/controllers/filtercontroller.h b/src/controllers/filtercontroller.h
@@ -45,14 +45,14 @@ class FilterController : public QObject
 public slots:
     void setProducer(Mlt::Producer *producer = 0);
     void attachFilter(int metadataIndex);
-    void removeFilter(int attachedIndex);
     void setCurrentFilter(int attachedIndex);
     void setFadeInDuration(int duration);
     void setFadeOutDuration(int duration);
 
 private slots:
     void handleAttachedModelChange();
     void addMetadata(QmlMetadata*);
+    void handleAttachedRowsAboutToBeRemoved(const QModelIndex & parent, int first, int last);
 
 private:
     void loadFilterMetadata();

diff --git a/src/docks/filtersdock.cpp b/src/docks/filtersdock.cpp
@@ -72,8 +72,6 @@ FiltersDock::FiltersDock(MetadataModel* metadataModel, AttachedFiltersModel* att
     QObject* root = m_qview.rootObject();
     QObject::connect(root, SIGNAL(attachFilterRequested(int)),
                      this, SIGNAL(attachFilterRequested(int)));
-    QObject::connect(root, SIGNAL(removeFilterRequested(int)),
-                     this, SIGNAL(removeFilterRequested(int)));
     QObject::connect(root, SIGNAL(currentFilterRequested(int)),
                      this, SIGNAL(currentFilterRequested(int)));
 

diff --git a/src/docks/filtersdock.h b/src/docks/filtersdock.h
@@ -38,7 +38,6 @@ class FiltersDock : public QDockWidget
 
 signals:
     void attachFilterRequested(int metadataIndex);
-    void removeFilterRequested(int attachedIndex);
     void currentFilterRequested(int attachedIndex);
 
 public slots:

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -219,7 +219,6 @@ MainWindow::MainWindow()
     addDockWidget(Qt::LeftDockWidgetArea, m_filtersDock);
     ui->menuView->addAction(m_filtersDock->toggleViewAction());
     connect(m_filtersDock, SIGNAL(attachFilterRequested(int)), m_filterController, SLOT(attachFilter(int)));
-    connect(m_filtersDock, SIGNAL(removeFilterRequested(int)), m_filterController, SLOT(removeFilter(int)));
     connect(m_filtersDock, SIGNAL(currentFilterRequested(int)), m_filterController, SLOT(setCurrentFilter(int)));
     connect(m_filtersDock->toggleViewAction(), SIGNAL(triggered(bool)), this, SLOT(onFiltersDockTriggered(bool)));
     connect(ui->actionFilters, SIGNAL(triggered()), this, SLOT(onFiltersDockTriggered()));

diff --git a/src/qml/views/filter/filterview.qml b/src/qml/views/filter/filterview.qml
@@ -85,7 +85,9 @@ Rectangle {
             tooltip: qsTr('Remove Selected Filter')
             onClicked: {
                 filterConfig.source = ""
-                root.removeFilterRequested(attachedFilters.selectedIndex)
+                attachedfiltersmodel.remove(attachedFilters.selectedIndex)
+                root.currentFilterRequested(attachedFilters.selectedIndex)
+                filterConfig.source = metadata ? metadata.qmlFilePath : ""
             }
         }
         Item {