Change QgsIdentifyResults and QgsMeasure from a QWidget tool window to a QDialogso that the window remains visible when QGIS is not the active application.

telwertowski · telwertowski · commit d665c4f2d0e4 · 2006-05-16T06:18:49.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@5462 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsidentifyresults.cpp b/src/gui/qgsidentifyresults.cpp
@@ -29,7 +29,7 @@
 
 QgsIdentifyResults::QgsIdentifyResults(const QgsAttributeAction& actions,
     QWidget *parent, Qt::WFlags f)
-: QWidget(parent, f),
+: QDialog(parent, f),
   mActions(actions), mClickedOnValue(0), mActionPopup(0)
 {
   setupUi(this);
diff --git a/src/gui/qgsidentifyresults.h b/src/gui/qgsidentifyresults.h
@@ -32,18 +32,14 @@ class Q3PopupMenu;
  *@author Gary E.Sherman
  */
 
-class QgsIdentifyResults: public QWidget, private Ui::QgsIdentifyResultsBase
+class QgsIdentifyResults: public QDialog, private Ui::QgsIdentifyResultsBase
 {
   Q_OBJECT;
   public:
 
   //! Constructor - takes it own copy of the QgsAttributeAction so
   // that it is independent of whoever created it.
-  //QgsIdentifyResults(const QgsAttributeAction& actions, QWidget *parent = 0,
-  //    Qt::WFlags f = Qt::Tool | Qt::MSWindowsFixedSizeDialogHint |Qt::WindowTitleHint);
-
-  QgsIdentifyResults(const QgsAttributeAction& actions, QWidget *parent = 0,
-                     Qt::WFlags f = Qt::Dialog );
+  QgsIdentifyResults(const QgsAttributeAction& actions, QWidget *parent = 0, Qt::WFlags f = 0);
 
   ~QgsIdentifyResults();
   /** Add an attribute to the feature display node */
diff --git a/src/gui/qgsmeasure.cpp b/src/gui/qgsmeasure.cpp
@@ -27,8 +27,8 @@
 #include <iostream>
 
 
-QgsMeasure::QgsMeasure(bool measureArea, QgsMapCanvas *mc, const char * name, Qt::WFlags f)
-  : QWidget(mc->topLevelWidget(), name, f), QgsMapTool(mc)
+QgsMeasure::QgsMeasure(bool measureArea, QgsMapCanvas *mc, Qt::WFlags f)
+  : QDialog(mc->topLevelWidget(), f), QgsMapTool(mc)
 {
     setupUi(this);
     connect(mRestartButton, SIGNAL(clicked()), this, SLOT(restart()));
@@ -143,7 +143,8 @@ void QgsMeasure::mousePress(QgsPoint &point)
     addPoint(point);
     this->show();
   }
-  
+  raise();
+
   mouseMove(point);
 }
 
diff --git a/src/gui/qgsmeasure.h b/src/gui/qgsmeasure.h
@@ -29,15 +29,13 @@ class QgsRubberBand;
 class QCloseEvent;
 
 
-class QgsMeasure:public QWidget, public QgsMapTool, private Ui::QgsMeasureBase
+class QgsMeasure:public QDialog, public QgsMapTool, private Ui::QgsMeasureBase
 {
   Q_OBJECT;
   public:
 
   //! Constructor
-  QgsMeasure(bool measureArea, QgsMapCanvas *, const char * name = 0,
-             Qt::WFlags f = Qt::WStyle_Customize | Qt::WStyle_DialogBorder |
-                            Qt::WStyle_Title | Qt::WType_Dialog | Qt::WStyle_Tool );
+  QgsMeasure(bool measureArea, QgsMapCanvas *mc, Qt::WFlags f = 0);
 
   ~QgsMeasure();
 
diff --git a/src/ui/qgsidentifyresultsbase.ui b/src/ui/qgsidentifyresultsbase.ui
@@ -3,7 +3,7 @@
  <comment></comment>
  <exportmacro></exportmacro>
  <class>QgsIdentifyResultsBase</class>
- <widget class="QWidget" name="QgsIdentifyResultsBase" >
+ <widget class="QDialog" name="QgsIdentifyResultsBase" >
   <property name="geometry" >
    <rect>
     <x>0</x>
diff --git a/src/ui/qgsmeasurebase.ui b/src/ui/qgsmeasurebase.ui
@@ -3,7 +3,7 @@
  <comment></comment>
  <exportmacro></exportmacro>
  <class>QgsMeasureBase</class>
- <widget class="QWidget" name="QgsMeasureBase" >
+ <widget class="QDialog" name="QgsMeasureBase" >
   <property name="geometry" >
    <rect>
     <x>0</x>

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`
`30`	`30`	`QgsIdentifyResults::QgsIdentifyResults(const QgsAttributeAction& actions,`
`31`	`31`	`QWidget *parent, Qt::WFlags f)`
`32`		`-: QWidget(parent, f),`
	`32`	`+: QDialog(parent, f),`
`33`	`33`	`mActions(actions), mClickedOnValue(0), mActionPopup(0)`
`34`	`34`	`{`
`35`	`35`	`setupUi(this);`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@`
`27`	`27`	`#include <iostream>`
`28`	`28`
`29`	`29`
`30`		`-QgsMeasure::QgsMeasure(bool measureArea, QgsMapCanvas mc, const char name, Qt::WFlags f)`
`31`		`- : QWidget(mc->topLevelWidget(), name, f), QgsMapTool(mc)`
	`30`	`+QgsMeasure::QgsMeasure(bool measureArea, QgsMapCanvas *mc, Qt::WFlags f)`
	`31`	`+ : QDialog(mc->topLevelWidget(), f), QgsMapTool(mc)`
`32`	`32`	`{`
`33`	`33`	`setupUi(this);`
`34`	`34`	`connect(mRestartButton, SIGNAL(clicked()), this, SLOT(restart()));`
`@@ -143,7 +143,8 @@ void QgsMeasure::mousePress(QgsPoint &point)`
`143`	`143`	`addPoint(point);`
`144`	`144`	`this->show();`
`145`	`145`	`}`
`146`		`-`
	`146`	`+ raise();`
	`147`	`+`
`147`	`148`	`mouseMove(point);`
`148`	`149`	`}`
`149`	`150`