Made QgsVectorLayerProperties a modal dialog, use QTreeWidgetItem::selectedItems() instead of QTreeWidget::currentItem() to determine the current legend layer

mhugent · mhugent · commit 2bc184ad8fcf · 2006-02-11T21:31:18.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@4827 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/legend/qgslegend.cpp b/src/legend/qgslegend.cpp
@@ -472,11 +472,19 @@ void QgsLegend::addLayer( QgsMapLayer * layer )
       {
 	setItemHidden(llfgroup, true);
       }
+    setCurrentItem(llayer);
 }
 
 QgsMapLayer* QgsLegend::currentLayer()
 {
-    QgsLegendItem* citem=dynamic_cast<QgsLegendItem*>(currentItem());
+    QList<QTreeWidgetItem*> selItems = selectedItems();
+    if(selItems.size() > 1)
+      {
+	return 0;
+      }
+    QList<QTreeWidgetItem*>::iterator it = selItems.begin();
+    QgsLegendItem* citem=dynamic_cast<QgsLegendItem*>(*it);
+
     if(citem)
     {
 	QgsLegendLayerFile* llf=dynamic_cast<QgsLegendLayerFile*>(citem);
diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui
@@ -24,6 +24,9 @@
   <property name="windowIcon" >
    <iconset/>
   </property>
+  <property name="modal" >
+   <bool>true</bool>
+  </property>
   <layout class="QGridLayout" >
    <property name="margin" >
     <number>9</number>

Original file line number	Diff line number	Diff line change
`@@ -472,11 +472,19 @@ void QgsLegend::addLayer( QgsMapLayer * layer )`
`472`	`472`	`{`
`473`	`473`	`setItemHidden(llfgroup, true);`
`474`	`474`	`}`
	`475`	`+ setCurrentItem(llayer);`
`475`	`476`	`}`
`476`	`477`
`477`	`478`	`QgsMapLayer* QgsLegend::currentLayer()`
`478`	`479`	`{`
`479`		`- QgsLegendItem* citem=dynamic_cast<QgsLegendItem*>(currentItem());`
	`480`	`+ QList<QTreeWidgetItem*> selItems = selectedItems();`
	`481`	`+ if(selItems.size() > 1)`
	`482`	`+ {`
	`483`	`+ return 0;`
	`484`	`+ }`
	`485`	`+ QList<QTreeWidgetItem*>::iterator it = selItems.begin();`
	`486`	`+ QgsLegendItem* citem=dynamic_cast<QgsLegendItem>(it);`
	`487`	`+`
`480`	`488`	`if(citem)`
`481`	`489`	`{`
`482`	`490`	`QgsLegendLayerFile* llf=dynamic_cast<QgsLegendLayerFile*>(citem);`