open attribute dialogs non-modal when not in editing mode

jef · jef · commit 094709112d7a · 2010-01-19T12:44:04.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12796 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsattributedialog.cpp b/src/app/qgsattributedialog.cpp
@@ -273,6 +273,16 @@ int QgsAttributeDialog::exec()
   }
 }
 
+void QgsAttributeDialog::show()
+{
+  if ( mDialog )
+  {
+    mDialog->setAttribute( Qt::WA_DeleteOnClose );
+    mDialog->show();
+    mDialog = 0;
+  }
+}
+
 void QgsAttributeDialog::saveGeometry()
 {
   if ( mDialog )
diff --git a/src/app/qgsattributedialog.h b/src/app/qgsattributedialog.h
@@ -54,6 +54,7 @@ class QgsAttributeDialog : public QObject
     void accept();
 
     int exec();
+    void show();
 
     void dialogDestroyed();
 
diff --git a/src/app/qgsidentifyresults.cpp b/src/app/qgsidentifyresults.cpp
@@ -293,7 +293,7 @@ void QgsIdentifyResults::show()
 // (saves the current window size/position)
 void QgsIdentifyResults::close()
 {
-  clear(); 
+  clear();
 
   delete mActionPopup;
   mActionPopup = 0;
@@ -761,7 +761,9 @@ void QgsIdentifyResults::featureForm()
 
   QgsAttributeMap src = f.attributeMap();
 
-  vlayer->beginEditCommand( tr( "Attribute changed" ) );
+  if ( vlayer->isEditable() )
+    vlayer->beginEditCommand( tr( "Attribute changed" ) );
+
   QgsAttributeDialog *ad = new QgsAttributeDialog( vlayer, &f );
 
   if ( !vlayer->isEditable() && vlayer->actions()->size() > 0 )
@@ -789,25 +791,33 @@ void QgsIdentifyResults::featureForm()
     }
   }
 
-  if ( ad->exec() )
+  if ( vlayer->isEditable() )
   {
-    const QgsAttributeMap &dst = f.attributeMap();
-    for ( QgsAttributeMap::const_iterator it = dst.begin(); it != dst.end(); it++ )
+    if ( ad->exec() )
     {
-      if ( !src.contains( it.key() ) || it.value() != src[it.key()] )
+      const QgsAttributeMap &dst = f.attributeMap();
+      for ( QgsAttributeMap::const_iterator it = dst.begin(); it != dst.end(); it++ )
       {
-        vlayer->changeAttributeValue( f.id(), it.key(), it.value() );
+        if ( !src.contains( it.key() ) || it.value() != src[it.key()] )
+        {
+          vlayer->changeAttributeValue( f.id(), it.key(), it.value() );
+        }
       }
+      vlayer->endEditCommand();
+    }
+    else
+    {
+      vlayer->destroyEditCommand();
     }
-    vlayer->endEditCommand();
+
+    delete ad;
+
+    mCanvas->refresh();
   }
   else
   {
-    vlayer->destroyEditCommand();
+    ad->show();
   }
-
-  delete ad;
-  mCanvas->refresh();
 }
 
 void QgsIdentifyResults::highlightAll()

Original file line number	Diff line number	Diff line change
`@@ -273,6 +273,16 @@ int QgsAttributeDialog::exec()`
`273`	`273`	`}`
`274`	`274`	`}`
`275`	`275`
	`276`	`+void QgsAttributeDialog::show()`
	`277`	`+{`
	`278`	`+ if ( mDialog )`
	`279`	`+ {`
	`280`	`+ mDialog->setAttribute( Qt::WA_DeleteOnClose );`
	`281`	`+ mDialog->show();`
	`282`	`+ mDialog = 0;`
	`283`	`+ }`
	`284`	`+}`
	`285`	`+`
`276`	`286`	`void QgsAttributeDialog::saveGeometry()`
`277`	`287`	`{`
`278`	`288`	`if ( mDialog )`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ void QgsIdentifyResults::show()`
`293`	`293`	`// (saves the current window size/position)`
`294`	`294`	`void QgsIdentifyResults::close()`
`295`	`295`	`{`
`296`		`- clear();`
	`296`	`+ clear();`
`297`	`297`
`298`	`298`	`delete mActionPopup;`
`299`	`299`	`mActionPopup = 0;`
`@@ -761,7 +761,9 @@ void QgsIdentifyResults::featureForm()`
`761`	`761`
`762`	`762`	`QgsAttributeMap src = f.attributeMap();`
`763`	`763`
`764`		`- vlayer->beginEditCommand( tr( "Attribute changed" ) );`
	`764`	`+ if ( vlayer->isEditable() )`
	`765`	`+ vlayer->beginEditCommand( tr( "Attribute changed" ) );`
	`766`	`+`
`765`	`767`	`QgsAttributeDialog *ad = new QgsAttributeDialog( vlayer, &f );`
`766`	`768`
`767`	`769`	`if ( !vlayer->isEditable() && vlayer->actions()->size() > 0 )`
`@@ -789,25 +791,33 @@ void QgsIdentifyResults::featureForm()`
`789`	`791`	`}`
`790`	`792`	`}`
`791`	`793`
`792`		`- if ( ad->exec() )`
	`794`	`+ if ( vlayer->isEditable() )`
`793`	`795`	`{`
`794`		`- const QgsAttributeMap &dst = f.attributeMap();`
`795`		`- for ( QgsAttributeMap::const_iterator it = dst.begin(); it != dst.end(); it++ )`
	`796`	`+ if ( ad->exec() )`
`796`	`797`	`{`
`797`		`- if ( !src.contains( it.key() ) \|\| it.value() != src[it.key()] )`
	`798`	`+ const QgsAttributeMap &dst = f.attributeMap();`
	`799`	`+ for ( QgsAttributeMap::const_iterator it = dst.begin(); it != dst.end(); it++ )`
`798`	`800`	`{`
`799`		`- vlayer->changeAttributeValue( f.id(), it.key(), it.value() );`
	`801`	`+ if ( !src.contains( it.key() ) \|\| it.value() != src[it.key()] )`
	`802`	`+ {`
	`803`	`+ vlayer->changeAttributeValue( f.id(), it.key(), it.value() );`
	`804`	`+ }`
`800`	`805`	`}`
	`806`	`+ vlayer->endEditCommand();`
	`807`	`+ }`
	`808`	`+ else`
	`809`	`+ {`
	`810`	`+ vlayer->destroyEditCommand();`
`801`	`811`	`}`
`802`		`- vlayer->endEditCommand();`
	`812`	`+`
	`813`	`+ delete ad;`
	`814`	`+`
	`815`	`+ mCanvas->refresh();`
`803`	`816`	`}`
`804`	`817`	`else`
`805`	`818`	`{`
`806`		`- vlayer->destroyEditCommand();`
	`819`	`+ ad->show();`
`807`	`820`	`}`
`808`		`-`
`809`		`- delete ad;`
`810`		`- mCanvas->refresh();`
`811`	`821`	`}`
`812`	`822`
`813`	`823`	`void QgsIdentifyResults::highlightAll()`