Fewer redraws if toggeling editing from vector props

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15173 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 15, 2011 · 69c4c88 · 69c4c88
1 parent fd5f119
commit 69c4c88
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -166,6 +166,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
 
 void QgsVectorLayerProperties::loadRows()
 {
+  QObject::disconnect( tblAttributes, SIGNAL( cellChanged( int, int ) ), this, SLOT( on_tblAttributes_cellChanged( int, int ) ) );
   const QgsFieldMap &fields = layer->pendingFields();
 
   tblAttributes->clear();
@@ -191,6 +192,7 @@ void QgsVectorLayerProperties::loadRows()
     setRow( row, it.key(), it.value() );
 
   tblAttributes->resizeColumnsToContents();
+  QObject::connect( tblAttributes, SIGNAL( cellChanged( int, int ) ), this, SLOT( on_tblAttributes_cellChanged( int, int ) ) );
 }
 
 void QgsVectorLayerProperties::setRow( int row, int idx, const QgsField &field )
@@ -382,7 +384,7 @@ void QgsVectorLayerProperties::deleteAttribute()
 
 void QgsVectorLayerProperties::editingToggled()
 {
-  if ( layer->isEditable() )
+  if ( !layer->isEditable() )
     loadRows();
 
   updateButtons();
@@ -1200,11 +1202,7 @@ void QgsVectorLayerProperties::on_mButtonAddJoin_clicked()
       }
 
       layer->addJoin( info );
-
-      //prevent complete redraw for each row
-      QObject::disconnect( tblAttributes, SIGNAL( cellChanged( int, int ) ), this, SLOT( on_tblAttributes_cellChanged( int, int ) ) );
       loadRows(); //update attribute tab
-      QObject::connect( tblAttributes, SIGNAL( cellChanged( int, int ) ), this, SLOT( on_tblAttributes_cellChanged( int, int ) ) );
       addJoinToTreeWidget( info );
     }
   }
@@ -1241,11 +1239,7 @@ void QgsVectorLayerProperties::on_mButtonRemoveJoin_clicked()
   }
 
   layer->removeJoin( currentJoinItem->data( 0, Qt::UserRole ).toString() );
-
-  //prevent complete redraw for each row
-  QObject::disconnect( tblAttributes, SIGNAL( cellChanged( int, int ) ), this, SLOT( on_tblAttributes_cellChanged( int, int ) ) );
   loadRows();
-  QObject::connect( tblAttributes, SIGNAL( cellChanged( int, int ) ), this, SLOT( on_tblAttributes_cellChanged( int, int ) ) );
   mJoinTreeWidget->takeTopLevelItem( mJoinTreeWidget->indexOfTopLevelItem( currentJoinItem ) );
 }