Multi relation removal

pvalsecc · m-kuhn · commit aaa3117bd5cf · 2016-11-08T16:28:07.000+01:00
Let the user select multiple relations and delete them.
diff --git a/src/app/qgsrelationmanagerdialog.cpp b/src/app/qgsrelationmanagerdialog.cpp
@@ -134,8 +134,11 @@ void QgsRelationManagerDialog::on_mBtnDiscoverRelations_clicked()
 
 void QgsRelationManagerDialog::on_mBtnRemoveRelation_clicked()
 {
-  if ( mRelationsTable->currentIndex().isValid() )
-    mRelationsTable->removeRow( mRelationsTable->currentItem()->row() );
+  const QModelIndexList rows = mRelationsTable->selectionModel()->selectedRows();
+  for ( int i = rows.size() - 1; i >= 0; --i )
+  {
+    mRelationsTable->removeRow( rows[i].row() );
+  }
 }
 
 QList< QgsRelation > QgsRelationManagerDialog::relations()
diff --git a/src/ui/qgsrelationmanagerdialogbase.ui b/src/ui/qgsrelationmanagerdialogbase.ui
@@ -16,6 +16,9 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QTableWidget" name="mRelationsTable">
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
      <property name="sortingEnabled">
       <bool>true</bool>
      </property>

Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,11 @@ void QgsRelationManagerDialog::on_mBtnDiscoverRelations_clicked()`
`134`	`134`
`135`	`135`	`void QgsRelationManagerDialog::on_mBtnRemoveRelation_clicked()`
`136`	`136`	`{`
`137`		`- if ( mRelationsTable->currentIndex().isValid() )`
`138`		`- mRelationsTable->removeRow( mRelationsTable->currentItem()->row() );`
	`137`	`+ const QModelIndexList rows = mRelationsTable->selectionModel()->selectedRows();`
	`138`	`+ for ( int i = rows.size() - 1; i >= 0; --i )`
	`139`	`+ {`
	`140`	`+ mRelationsTable->removeRow( rows[i].row() );`
	`141`	`+ }`
`139`	`142`	`}`
`140`	`143`
`141`	`144`	`QList< QgsRelation > QgsRelationManagerDialog::relations()`