[joins] editing keeps the same order and selection in GUI

qgis · Mar 12, 2015 · a9e58e6 · a9e58e6
1 parent 1810cdd
commit a9e58e6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -1099,11 +1099,11 @@ void QgsVectorLayerProperties::on_mButtonEditJoin_clicked()
 
     // remove old join
     layer->removeJoin( joinLayerId );
-    mJoinTreeWidget->takeTopLevelItem( mJoinTreeWidget->indexOfTopLevelItem( currentJoinItem ) );
+    int idx = mJoinTreeWidget->indexOfTopLevelItem( currentJoinItem );
+    mJoinTreeWidget->takeTopLevelItem( idx );
 
     // add the new edited
 
-
     //create attribute index if possible
     if ( d.createAttributeIndex() )
     {
@@ -1114,15 +1114,15 @@ void QgsVectorLayerProperties::on_mButtonEditJoin_clicked()
       }
     }
     layer->addJoin( info );
-    addJoinToTreeWidget( info );
+    addJoinToTreeWidget( info, idx );
 
     pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&
                                  !layer->isEditable() && layer->vectorJoins().size() < 1 );
     mFieldsPropertiesDialog->init();
   }
 }
 
-void QgsVectorLayerProperties::addJoinToTreeWidget( const QgsVectorJoinInfo& join )
+void QgsVectorLayerProperties::addJoinToTreeWidget( const QgsVectorJoinInfo& join, const int insertIndex )
 {
   QTreeWidgetItem* joinItem = new QTreeWidgetItem();
 
@@ -1170,11 +1170,19 @@ void QgsVectorLayerProperties::addJoinToTreeWidget( const QgsVectorJoinInfo& joi
     joinItem->setText( 5, tr( "all" ) );
   }
 
-  mJoinTreeWidget->addTopLevelItem( joinItem );
+  if ( insertIndex >= 0 )
+  {
+    mJoinTreeWidget->insertTopLevelItem( insertIndex, joinItem );
+  }
+  else
+  {
+    mJoinTreeWidget->addTopLevelItem( joinItem );
+  }
   for ( int c = 0; c < 5; c++ )
   {
     mJoinTreeWidget->resizeColumnToContents( c );
   }
+  mJoinTreeWidget->setCurrentItem( joinItem );
 }
 
 void QgsVectorLayerProperties::on_mButtonRemoveJoin_clicked()

diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h
@@ -181,7 +181,7 @@ class APP_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private
     //QPixmap bufferPixmap;
 
     /**Adds a new join to mJoinTreeWidget*/
-    void addJoinToTreeWidget( const QgsVectorJoinInfo& join );
+    void addJoinToTreeWidget( const QgsVectorJoinInfo& join , const int insertIndex = -1 );
 };
 
 inline QString QgsVectorLayerProperties::displayName()