Showing with 6 additions and 5 deletions.
  1. +3 −2 src/app/qgisapp.cpp
  2. +3 −3 src/plugins/heatmap/heatmap.cpp
5 changes: 3 additions & 2 deletions src/app/qgisapp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6164,9 +6164,10 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
//start editing/stop editing
if ( dprovider->capabilities() & QgsVectorDataProvider::EditingCapabilities )
{
mActionToggleEditing->setEnabled( !vlayer->isReadOnly() );
bool canChangeAttributes = dprovider->capabilities() & QgsVectorDataProvider::ChangeAttributeValues;
mActionToggleEditing->setEnabled( canChangeAttributes && !vlayer->isReadOnly() );
mActionToggleEditing->setChecked( vlayer->isEditable() );
mActionSaveEdits->setEnabled( vlayer->isEditable() );
mActionSaveEdits->setEnabled( canChangeAttributes && vlayer->isEditable() );
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/heatmap/heatmap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ void Heatmap::initGui()
// Connect the action to the run
connect( mQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) );
// Add the icon to the toolbar
mQGisIface->addToolBarIcon( mQActionPointer );
mQGisIface->addRasterToolBarIcon( mQActionPointer );
mQGisIface->addPluginToRasterMenu( tr( "&Heatmap" ), mQActionPointer );

}
Expand Down Expand Up @@ -108,8 +108,8 @@ void Heatmap::run()
void Heatmap::unload()
{
// remove the GUI
mQGisIface->removePluginMenu( "&Heatmap", mQActionPointer );
mQGisIface->removeToolBarIcon( mQActionPointer );
mQGisIface->removePluginRasterMenu( "&Heatmap", mQActionPointer );
mQGisIface->removeRasterToolBarIcon( mQActionPointer );
delete mQActionPointer;
}

Expand Down