[qgis] 04/14: Add patch from upstream release_2.2 branch: 0001-don-t-open-the-identify-dialog-beforehand-if-Open-fe.patch

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository qgis.

commit b2654a17166b97023c56d4ab532e80c34d0a73be
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Mar 1 14:41:12 2014 +0100

    Add patch from upstream release_2.2 branch: 0001-don-t-open-the-identify-dialog-beforehand-if-Open-fe.patch
---
 ...the-identify-dialog-beforehand-if-Open-fe.patch | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/debian/patches/0001-don-t-open-the-identify-dialog-beforehand-if-Open-fe.patch b/debian/patches/0001-don-t-open-the-identify-dialog-beforehand-if-Open-fe.patch
new file mode 100644
index 0000000..2cafae7
--- /dev/null
+++ b/debian/patches/0001-don-t-open-the-identify-dialog-beforehand-if-Open-fe.patch
@@ -0,0 +1,28 @@
+From 2475c0e25b843b73c8aa2ef39cb91b4d524daacc Mon Sep 17 00:00:00 2001
+From: "Juergen E. Fischer" <jef at norbit.de>
+Date: Mon, 24 Feb 2014 18:01:35 +0100
+Subject: don't open the identify dialog beforehand if 'Open feature form, if
+ a single feature is identified' is active and there is only one
+ result (fixes #9631)
+Bug: http://hub.qgis.org/issues/9631
+Origin: https://github.com/qgis/QGIS/commit/2475c0e25b843b73c8aa2ef39cb91b4d524daacc
+
+---
+ src/app/qgsmaptoolidentifyaction.cpp |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/src/app/qgsmaptoolidentifyaction.cpp
++++ b/src/app/qgsmaptoolidentifyaction.cpp
+@@ -102,9 +102,10 @@ void QgsMapToolIdentifyAction::canvasRel
+ 
+   if ( !results.isEmpty() )
+   {
+-    // Show the dialog before items are inserted so that items can resize themselfs
++    // Show the dialog before items are inserted so that items can resize themselves
+     // according to dialog size also the first time, see also #9377
+-    resultsDialog()->QDialog::show();
++    if( results.size() != 1 || !QSettings().value( "/Map/identifyAutoFeatureForm", false ).toBool() )
++      resultsDialog()->QDialog::show();
+ 
+     QList<IdentifyResult>::const_iterator result;
+     for ( result = results.begin(); result != results.end(); ++result )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git