Skip to content

Commit a4aff07

Browse files
author
mhugent
committed
layers are now editable by default such that people do not have to search for the layer file in the legend
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5232 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 64c4203 commit a4aff07

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

src/gui/qgsmaptoolcapture.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void QgsMapToolCapture::canvasReleaseEvent(QMouseEvent * e)
8585
if (!vlayer->isEditable())
8686
{
8787
QMessageBox::information(0,"Layer not editable",
88-
"Cannot edit the vector layer. Use 'Start editing' in the legend item menu",
88+
"Cannot edit the vector layer. To make it editable, go to the file item of the layer, right click and check 'Allow Editing'.",
8989
QMessageBox::Ok);
9090
return;
9191
}

src/gui/qgsvectorlayer.cpp

+15
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ QgsVectorLayer::QgsVectorLayer(QString vectorLayerPath,
138138
// have no effect on existing layers
139139
QSettings settings;
140140
updateThreshold = settings.readNumEntry("Map/updateThreshold", 1000);
141+
//editing is now enabled by default
142+
if(dataProvider->capabilities()&QgsVectorDataProvider::AddFeatures)
143+
{
144+
startEditing();
145+
}
141146
} // QgsVectorLayer ctor
142147

143148

@@ -1265,6 +1270,16 @@ void QgsVectorLayer::initContextMenu_(QgisApp * app)
12651270
{
12661271
mToggleEditingAction = popMenu->addAction(tr("Allow Editing"),this,SLOT(toggleEditing()));
12671272
mToggleEditingAction->setCheckable(true);
1273+
mToggleEditingAction->blockSignals(true);
1274+
if(mEditable)
1275+
{
1276+
mToggleEditingAction->setChecked(true);
1277+
}
1278+
else
1279+
{
1280+
mToggleEditingAction->setChecked(false);
1281+
}
1282+
mToggleEditingAction->blockSignals(false);
12681283
}
12691284

12701285
if(cap&QgsVectorDataProvider::SaveAsShapefile)

src/legend/qgslegend.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ void QgsLegend::addLayer( QgsMapLayer * layer )
482482

483483
setExpanded(indexFromItem(llayer), true);
484484
setExpanded(indexFromItem(llfgroup), false);
485-
//todo: only if qsetting for 'legend layer file visible' is not set
485+
//only if qsetting for 'legend layer file visible' is not set
486486
if(!mShowLegendLayerFiles)
487487
{
488488
setItemHidden(llfgroup, true);

0 commit comments

Comments
 (0)