From d57835a2b7300606c9dd33aad6ab96383456af59 Mon Sep 17 00:00:00 2001
From: mhugent <mhugent@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Fri, 26 Mar 2004 17:44:28 +0000
Subject: [PATCH] passing window focus back to the vector properties dialog
 after chosing a color/ linestyle/ image

git-svn-id: http://svn.osgeo.org/qgis/trunk@1104 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 src/qgscontcoldialog.cpp        |  6 ++----
 src/qgsgrasyextensionwidget.cpp |  3 +++
 src/qgssimadialog.cpp           |  2 ++
 src/qgssisydialog.cpp           | 12 ++++--------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/qgscontcoldialog.cpp b/src/qgscontcoldialog.cpp
index 03f146ae214..9a8b9190f81 100644
--- a/src/qgscontcoldialog.cpp
+++ b/src/qgscontcoldialog.cpp
@@ -259,13 +259,11 @@ void QgsContColDialog::apply()
 void QgsContColDialog::selectMinimumColor()
 {
     mincolorbutton->setPaletteBackgroundColor(QColorDialog::getColor());
-    mVectorLayer->propertiesDialog()->raise();
-    raise();
+    setActiveWindow();
 }
 
 void QgsContColDialog::selectMaximumColor()
 {
     maxcolorbutton->setPaletteBackgroundColor(QColorDialog::getColor());
-    mVectorLayer->propertiesDialog()->raise();
-    raise();
+    setActiveWindow();
 }
diff --git a/src/qgsgrasyextensionwidget.cpp b/src/qgsgrasyextensionwidget.cpp
index 7947e01d643..c7545f83245 100644
--- a/src/qgsgrasyextensionwidget.cpp
+++ b/src/qgsgrasyextensionwidget.cpp
@@ -234,6 +234,7 @@ QWidget *QgsGraSyExtensionWidget::getWidget(int column, int row)
 void QgsGraSyExtensionWidget::selectColor()
 {
     ((QPushButton *) sender())->setPaletteBackgroundColor(QColorDialog::getColor());
+    setActiveWindow();
 }
 
 void QgsGraSyExtensionWidget::selectFillPattern()
@@ -244,6 +245,7 @@ void QgsGraSyExtensionWidget::selectFillPattern()
 	((QPushButton *) sender())->setName(QgsSymbologyUtils::brushStyle2Char(patterndialog.pattern()));
 	((QPushButton *) sender())->setPixmap(QgsSymbologyUtils::brushStyle2Pixmap(patterndialog.pattern()));
     }
+    setActiveWindow();
 }
 
 void QgsGraSyExtensionWidget::selectOutlineStyle()
@@ -254,6 +256,7 @@ void QgsGraSyExtensionWidget::selectOutlineStyle()
 	((QPushButton *) sender())->setName(QgsSymbologyUtils::penStyle2Char(linestyledialog.style()));
 	((QPushButton *) sender())->setPixmap(QgsSymbologyUtils::penStyle2Pixmap(linestyledialog.style()));
     }
+    setActiveWindow();
 }
 
 void QgsGraSyExtensionWidget::resizeEvent(QResizeEvent* e)
diff --git a/src/qgssimadialog.cpp b/src/qgssimadialog.cpp
index 4f7ec680d9c..f0420a51a75 100644
--- a/src/qgssimadialog.cpp
+++ b/src/qgssimadialog.cpp
@@ -222,6 +222,8 @@ void QgsSiMaDialog::selectMarker()
     p.scale(scalefactor,scalefactor);
     p.drawPicture(0,0,pic);
     mImageButton->setPixmap(pixmap);
+
+    setActiveWindow();
 }
 
 void QgsSiMaDialog::updateMarkerSize()
diff --git a/src/qgssisydialog.cpp b/src/qgssisydialog.cpp
index d447f33a8f2..f8edd231873 100644
--- a/src/qgssisydialog.cpp
+++ b/src/qgssisydialog.cpp
@@ -102,8 +102,7 @@ QgsSiSyDialog::~QgsSiSyDialog()
 void QgsSiSyDialog::selectOutlineColor()
 {
     outlinecolorbutton->setPaletteBackgroundColor(QColorDialog::getColor());
-    mVectorLayer->propertiesDialog()->raise();
-    raise();
+    setActiveWindow();
 }
 
 void QgsSiSyDialog::selectOutlineStyle()
@@ -114,15 +113,13 @@ void QgsSiSyDialog::selectOutlineStyle()
 	stylebutton->setName(QgsSymbologyUtils::penStyle2QString(linestyledialog.style()).ascii());
 	stylebutton->setPixmap(QgsSymbologyUtils::qString2LinePixmap(QString::fromAscii(stylebutton->name())));
     }
-    mVectorLayer->propertiesDialog()->raise();
-    raise();
+    setActiveWindow();
 }
 
 void QgsSiSyDialog::selectFillColor()
 {
     fillcolorbutton->setPaletteBackgroundColor(QColorDialog::getColor());
-    mVectorLayer->propertiesDialog()->raise();
-    raise();
+    setActiveWindow();
 }
 
 void QgsSiSyDialog::selectFillPattern()
@@ -133,8 +130,7 @@ void QgsSiSyDialog::selectFillPattern()
 	patternbutton->setName(QgsSymbologyUtils::brushStyle2Char(patterndialog.pattern()));
 	patternbutton->setPixmap(QgsSymbologyUtils::brushStyle2Pixmap(patterndialog.pattern()));
     }
-    mVectorLayer->propertiesDialog()->raise();
-    raise();
+    setActiveWindow();
 }
 
 void QgsSiSyDialog::apply()