From ed4278c46c9fd0d307d766e06c9b5c29f15c5773 Mon Sep 17 00:00:00 2001
From: g_j_m <g_j_m@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Sat, 28 Jan 2006 20:25:05 +0000
Subject: [PATCH] When the vector project properties dialog box is requested,
 bring it to the front if it already exists.

git-svn-id: http://svn.osgeo.org/qgis/trunk@4767 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 src/gui/qgsvectorlayer.cpp | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/gui/qgsvectorlayer.cpp b/src/gui/qgsvectorlayer.cpp
index 4e14cd627ae..fd30a97439d 100644
--- a/src/gui/qgsvectorlayer.cpp
+++ b/src/gui/qgsvectorlayer.cpp
@@ -1408,29 +1408,38 @@ void QgsVectorLayer::showLayerProperties()
   qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 
 
+  if (!m_propertiesDialog)
+  {
 #ifdef QGISDEBUG
-  std::cerr << "Creating new QgsVectorLayerProperties object\n";
+    std::cerr << "Creating new QgsVectorLayerProperties object\n";
 #endif
-  m_propertiesDialog = new QgsVectorLayerProperties(this);
-  // Make sure that the UI starts out with the correct display
-  // field value
+    m_propertiesDialog = new QgsVectorLayerProperties(this);
+    // Make sure that the UI starts out with the correct display
+    // field value
 #ifdef QGISDEBUG
-  std::cerr << "Setting display field in prop dialog\n";
+    std::cerr << "Setting display field in prop dialog\n";
 #endif
-  m_propertiesDialog->setDisplayField(displayField());
+    m_propertiesDialog->setDisplayField(displayField());
 
 #ifdef QGISDEBUG
-  std::cerr << "Resetting prop dialog\n";
+    std::cerr << "Resetting prop dialog\n";
 #endif
-  m_propertiesDialog->reset();
+    m_propertiesDialog->reset();
 #ifdef QGISDEBUG
-  std::cerr << "Raising prop dialog\n";
+    std::cerr << "Raising prop dialog\n";
 #endif
-  m_propertiesDialog->raise();
+    m_propertiesDialog->raise();
 #ifdef QGISDEBUG
-  std::cerr << "Showing prop dialog\n";
+    std::cerr << "Showing prop dialog\n";
 #endif
-  m_propertiesDialog->show();
+    m_propertiesDialog->show();
+  }
+  else
+  {
+    m_propertiesDialog->show();
+    m_propertiesDialog->raise();
+  }
+
   // restore normal cursor
   qApp->restoreOverrideCursor();
 }