[QGIS Commit] r9011 - in trunk/qgis: python/gui src/app src/gui src/plugins/grass src/plugins/wfs src/ui

svn_qgis at osgeo.org svn_qgis at osgeo.org
Wed Aug 6 20:16:38 EDT 2008


Author: timlinux
Date: 2008-08-06 20:16:37 -0400 (Wed, 06 Aug 2008)
New Revision: 9011

Added:
   trunk/qgis/python/gui/qgsgenericprojectionselector.sip
   trunk/qgis/src/gui/qgsgenericprojectionselector.cpp
   trunk/qgis/src/gui/qgsgenericprojectionselector.h
   trunk/qgis/src/ui/qgsgenericprojectionselectorbase.ui
Removed:
   trunk/qgis/python/gui/qgslayerprojectionselector.sip
   trunk/qgis/src/gui/qgslayerprojectionselector.cpp
   trunk/qgis/src/gui/qgslayerprojectionselector.h
   trunk/qgis/src/ui/qgslayerprojectionselectorbase.ui
Modified:
   trunk/qgis/python/gui/gui.sip
   trunk/qgis/python/gui/qgsprojectionselector.sip
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/app/qgsoptions.cpp
   trunk/qgis/src/app/qgsprojectproperties.cpp
   trunk/qgis/src/app/qgsrasterlayerproperties.cpp
   trunk/qgis/src/app/qgsserversourceselect.cpp
   trunk/qgis/src/app/qgsvectorlayerproperties.cpp
   trunk/qgis/src/gui/CMakeLists.txt
   trunk/qgis/src/gui/qgsprojectionselector.cpp
   trunk/qgis/src/gui/qgsprojectionselector.h
   trunk/qgis/src/plugins/grass/qgsgrassnewmapset.cpp
   trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp
   trunk/qgis/src/plugins/wfs/qgswfssourceselect.h
   trunk/qgis/src/ui/CMakeLists.txt
Log:
Various changes relating to projection selector: Renamed QgsLayerProjectionSelector to QgsGenericProjectionSelector so that it can be used in other contexts too. Added setSelectedEpsg call to projection selector. Added setMessage() call to generic projection selector. Updated python bindings accordingly.

Modified: trunk/qgis/python/gui/gui.sip
===================================================================
--- trunk/qgis/python/gui/gui.sip	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/python/gui/gui.sip	2008-08-07 00:16:37 UTC (rev 9011)
@@ -10,7 +10,7 @@
 
 %Include qgisinterface.sip
 %Include qgsencodingfiledialog.sip
-%Include qgslayerprojectionselector.sip
+%Include qgsgenericprojectionselector.sip
 %Include qgsmapcanvas.sip
 %Include qgsmapcanvasitem.sip
 %Include qgsmapcanvasmap.sip

Copied: trunk/qgis/python/gui/qgsgenericprojectionselector.sip (from rev 9008, trunk/qgis/python/gui/qgslayerprojectionselector.sip)
===================================================================
--- trunk/qgis/python/gui/qgsgenericprojectionselector.sip	                        (rev 0)
+++ trunk/qgis/python/gui/qgsgenericprojectionselector.sip	2008-08-07 00:16:37 UTC (rev 9011)
@@ -0,0 +1,54 @@
+
+/**
+ * \class QgsGenericProjectionSelector 
+ * \brief A generic dialog to prompt the user for a Coordinate Reference System
+ */
+class QgsGenericProjectionSelector : QDialog //, private Ui::QgsGenericProjectionSelectorBase
+{
+%TypeHeaderCode
+#include <qgsgenericprojectionselector.h>
+%End
+
+  public:
+    /**
+     * Constructor
+     */
+    QgsGenericProjectionSelector(QWidget *parent = 0, 
+                               Qt::WFlags fl = QgisGui::ModalDialogFlags);
+
+    //! Destructor
+    ~QgsGenericProjectionSelector();
+
+ public slots:
+      /** If no paramter is passed, the message will be a generic
+       * 'define the CRS for this layer'.
+       */
+      void setMessage(QString theMessage="");
+      
+      QString getSelectedProj4String();
+      long getSelectedSRSID();
+      long getSelectedEpsg();
+
+      void setSelectedSRSName(QString theName);
+      void setSelectedSRSID(long theID);
+      void setSelectedEpsg(long theID);
+
+      /**
+       * \brief filters this dialog by the given CRSs
+       *
+       * Sets this dialog to filter the available projections to those listed
+       * by the given Coordinate Reference Systems.
+       *
+       * \param crsFilter a list of OGC Coordinate Reference Systems to filter the 
+       *                  list of projections by.  This is useful in (e.g.) WMS situations
+       *                  where you just want to offer what the WMS server can support.
+       *
+       * \note This function only deals with EPSG labels only at this time.
+       *
+       * \warning This function's behaviour is undefined if it is called after the dialog is shown.
+       */
+      void setOgcWmsCrsFilter(QSet<QString> crsFilter);
+
+
+};
+

Deleted: trunk/qgis/python/gui/qgslayerprojectionselector.sip
===================================================================
--- trunk/qgis/python/gui/qgslayerprojectionselector.sip	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/python/gui/qgslayerprojectionselector.sip	2008-08-07 00:16:37 UTC (rev 9011)
@@ -1,49 +0,0 @@
-
-/**
- * \class QgsLayerProjectionSelector
- * \brief Set Projection system for a layer
- */
-
-class QgsLayerProjectionSelector : QDialog //, private Ui::QgsLayerProjectionSelectorBase
-{
-%TypeHeaderCode
-#include <qgslayerprojectionselector.h>
-%End
-
-  public:
-    /**
-     * Constructor
-     */
-    QgsLayerProjectionSelector(QWidget *parent = 0, 
-                               Qt::WFlags fl = QgisGui::ModalDialogFlags);
-
-    //! Destructor
-    ~QgsLayerProjectionSelector();
-
- public slots:
-      QString getCurrentProj4String();
-      long getCurrentSRSID();
-      long getCurrentEpsg();
-
-      void setSelectedSRSName(QString theName);
-      void setSelectedSRSID(long theID);
-
-      /**
-       * \brief filters this dialog by the given CRSs
-       *
-       * Sets this dialog to filter the available projections to those listed
-       * by the given Coordinate Reference Systems.
-       *
-       * \param crsFilter a list of OGC Coordinate Reference Systems to filter the 
-       *                  list of projections by.  This is useful in (e.g.) WMS situations
-       *                  where you just want to offer what the WMS server can support.
-       *
-       * \note This function only deals with EPSG labels only at this time.
-       *
-       * \warning This function's behaviour is undefined if it is called after the dialog is shown.
-       */
-      void setOgcWmsCrsFilter(QSet<QString> crsFilter);
-
-
-};
-

Modified: trunk/qgis/python/gui/qgsprojectionselector.sip
===================================================================
--- trunk/qgis/python/gui/qgsprojectionselector.sip	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/python/gui/qgsprojectionselector.sip	2008-08-07 00:16:37 UTC (rev 9011)
@@ -54,7 +54,7 @@
       const QString stringSQLSafe(const QString theSQL);
 
       //! Gets the current EPSG-style projection identifier
-      long getCurrentEpsg();
+      long getSelectedEpsg();
 
     public slots:
       void setSelectedSRSName(QString theSRSName);
@@ -62,14 +62,16 @@
       QString getSelectedName();
 
       void setSelectedSRSID(long theSRSID);
+      
+      void setSelectedEpsg(long epsg);
 
-      QString getCurrentProj4String();
+      QString getSelectedProj4String();
 
       //! Gets the current PostGIS-style projection identifier
-      long getCurrentSRID();
+      long getSelectedSRID();
 
       //! Gets the current QGIS projection identfier
-      long getCurrentSRSID();
+      long getSelectedSRSID();
 
       /**
        * \brief filters this widget by the given CRSs

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/src/app/qgisapp.cpp	2008-08-07 00:16:37 UTC (rev 9011)
@@ -96,7 +96,7 @@
 #include "qgsfeature.h"
 #include "qgsgeomtypedialog.h"
 #include "qgshelpviewer.h"
-#include "qgslayerprojectionselector.h"
+#include "qgsgenericprojectionselector.h"
 #include "qgslegend.h"
 #include "qgslegendlayerfile.h"
 #include "qgslegendlayer.h"
@@ -264,7 +264,8 @@
     //@note this class is not a descendent of QWidget so we cant pass
     //it in the ctor of the layer projection selector
 
-    QgsLayerProjectionSelector * mySelector = new QgsLayerProjectionSelector();
+    QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector();
+    mySelector->setMessage(); //shows a generic message
     proj4String = QgsProject::instance()->readEntry("SpatialRefSys","//ProjectSRSProj4String",GEOPROJ4);
     QgsSpatialRefSys defaultSRS;
     if(defaultSRS.createFromProj4(proj4String))
@@ -274,8 +275,8 @@
 
     if(mySelector->exec())
     {
-      QgsDebugMsg("Layer srs set from dialog: " + QString::number(mySelector->getCurrentSRSID()));
-      srs->createFromProj4(mySelector->getCurrentProj4String());
+      QgsDebugMsg("Layer srs set from dialog: " + QString::number(mySelector->getSelectedSRSID()));
+      srs->createFromProj4(mySelector->getSelectedProj4String());
       srs->debugPrint();
     }
     else

Modified: trunk/qgis/src/app/qgsoptions.cpp
===================================================================
--- trunk/qgis/src/app/qgsoptions.cpp	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/src/app/qgsoptions.cpp	2008-08-07 00:16:37 UTC (rev 9011)
@@ -20,7 +20,7 @@
 #include "qgsoptions.h"
 #include "qgis.h"
 #include "qgisapp.h"
-#include "qgslayerprojectionselector.h"
+#include "qgsgenericprojectionselector.h"
 #include "qgsspatialrefsys.h"
 
 #include <QFileDialog>
@@ -365,7 +365,7 @@
 void QgsOptions::on_pbnSelectProjection_clicked()
 {
   QSettings settings;
-  QgsLayerProjectionSelector * mySelector = new QgsLayerProjectionSelector(this);
+  QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector(this);
 
   //find out srs id of current proj4 string
   QgsSpatialRefSys refSys;
@@ -380,7 +380,7 @@
     std::cout << "------ Global Default Projection Selection Set ----------" << std::endl;
 #endif 
     //! @todo changes this control name in gui to txtGlobalProjString
-    txtGlobalWKT->setText(mySelector->getCurrentProj4String());
+    txtGlobalWKT->setText(mySelector->getSelectedProj4String());
 #ifdef QGISDEBUG
     std::cout << "------ Global Default Projection now set to ----------\n" << mGlobalSRSID << std::endl;
 #endif

Modified: trunk/qgis/src/app/qgsprojectproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsprojectproperties.cpp	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/src/app/qgsprojectproperties.cpp	2008-08-07 00:16:37 UTC (rev 9011)
@@ -245,15 +245,15 @@
   // selected that has an srid. This prevents error if the user
   // selects a top-level node rather than an actual coordinate
   // system
-  long mySRSID = projectionSelector->getCurrentSRSID();
+  long mySRSID = projectionSelector->getSelectedSRSID();
   if (mySRSID)
   {
     QgsSpatialRefSys srs(mySRSID, QgsSpatialRefSys::QGIS_SRSID);
     myRender->setDestinationSrs(srs);
     
     // write the currently selected projections _proj string_ to project settings
-    std::cout << "SpatialRefSys/ProjectSRSProj4String: " <<  projectionSelector->getCurrentProj4String().toLocal8Bit().data() << std::endl;
-    QgsProject::instance()->writeEntry("SpatialRefSys","/ProjectSRSProj4String",projectionSelector->getCurrentProj4String());
+    std::cout << "SpatialRefSys/ProjectSRSProj4String: " <<  projectionSelector->getSelectedProj4String().toLocal8Bit().data() << std::endl;
+    QgsProject::instance()->writeEntry("SpatialRefSys","/ProjectSRSProj4String",projectionSelector->getSelectedProj4String());
 
     // Set the map units to the projected coordinates if we are projecting
     if (isProjected())

Modified: trunk/qgis/src/app/qgsrasterlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsrasterlayerproperties.cpp	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/src/app/qgsrasterlayerproperties.cpp	2008-08-07 00:16:37 UTC (rev 9011)
@@ -20,7 +20,7 @@
 #include "qgisapp.h"
 #include "qgscoordinatetransform.h"
 #include "qgsrasterlayerproperties.h"
-#include "qgslayerprojectionselector.h"
+#include "qgsgenericprojectionselector.h"
 #include "qgsproject.h"
 #include "qgsrasterbandstats.h"
 #include "qgsrasterlayer.h"
@@ -1704,11 +1704,11 @@
 void QgsRasterLayerProperties::on_pbnChangeSpatialRefSys_clicked()
 {
 
-  QgsLayerProjectionSelector * mySelector = new QgsLayerProjectionSelector(this);
+  QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector(this);
   mySelector->setSelectedSRSID(mRasterLayer->srs().srsid());
   if(mySelector->exec())
   {
-    QgsSpatialRefSys srs(mySelector->getCurrentSRSID(), QgsSpatialRefSys::QGIS_SRSID);
+    QgsSpatialRefSys srs(mySelector->getSelectedSRSID(), QgsSpatialRefSys::QGIS_SRSID);
     mRasterLayer->setSrs(srs);
   }
   else

Modified: trunk/qgis/src/app/qgsserversourceselect.cpp
===================================================================
--- trunk/qgis/src/app/qgsserversourceselect.cpp	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/src/app/qgsserversourceselect.cpp	2008-08-07 00:16:37 UTC (rev 9011)
@@ -18,7 +18,7 @@
 
 #include "qgsserversourceselect.h"
 
-#include "qgslayerprojectionselector.h"
+#include "qgsgenericprojectionselector.h"
 
 #include "qgsnewhttpconnection.h"
 #include "qgsnumericsortlistviewitem.h"
@@ -429,8 +429,9 @@
 
   QSet<QString> crsFilter = mWmsProvider->supportedCrsForLayers(m_selectedLayers);
 
-  QgsLayerProjectionSelector * mySelector =
-    new QgsLayerProjectionSelector(this);
+  QgsGenericProjectionSelector * mySelector =
+    new QgsGenericProjectionSelector(this);
+  mySelector->setMessage();
 
   mySelector->setOgcWmsCrsFilter(crsFilter);
 
@@ -443,7 +444,7 @@
 
   if (mySelector->exec())
   {
-    m_Epsg = mySelector->getCurrentEpsg();
+    m_Epsg = mySelector->getSelectedEpsg();
   }
   else
   {
@@ -451,7 +452,7 @@
   }
 
   labelCoordRefSys->setText( descriptionForEpsg(m_Epsg) );
-//  labelCoordRefSys->setText( mySelector->getCurrentProj4String() );
+//  labelCoordRefSys->setText( mySelector->getSelectedProj4String() );
 
   delete mySelector;
 

Modified: trunk/qgis/src/app/qgsvectorlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2008-08-07 00:16:37 UTC (rev 9011)
@@ -27,7 +27,7 @@
 #include "qgsgraduatedsymboldialog.h"
 #include "qgslabeldialog.h"
 #include "qgslabel.h"
-#include "qgslayerprojectionselector.h"
+#include "qgsgenericprojectionselector.h"
 #include "qgslogger.h"
 #include "qgsproject.h"
 #include "qgssinglesymboldialog.h"
@@ -609,11 +609,12 @@
 
 void QgsVectorLayerProperties::on_pbnChangeSpatialRefSys_clicked()
 {
-  QgsLayerProjectionSelector * mySelector = new QgsLayerProjectionSelector(this);
+  QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector(this);
+  mySelector->setMessage();
   mySelector->setSelectedSRSID(layer->srs().srsid());
   if(mySelector->exec())
   {
-    QgsSpatialRefSys srs(mySelector->getCurrentSRSID(), QgsSpatialRefSys::QGIS_SRSID);
+    QgsSpatialRefSys srs(mySelector->getSelectedSRSID(), QgsSpatialRefSys::QGIS_SRSID);
     layer->setSrs(srs);
   }
   else

Modified: trunk/qgis/src/gui/CMakeLists.txt
===================================================================
--- trunk/qgis/src/gui/CMakeLists.txt	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/src/gui/CMakeLists.txt	2008-08-07 00:16:37 UTC (rev 9011)
@@ -9,7 +9,7 @@
 qgsdetaileditemdata.cpp
 qgsencodingfiledialog.cpp
 qgsfiledropedit.cpp
-qgslayerprojectionselector.cpp
+qgsgenericprojectionselector.cpp
 qgsmapcanvas.cpp
 qgsmapcanvasitem.cpp
 qgsmapcanvasmap.cpp
@@ -32,7 +32,7 @@
 qgsdetaileditemwidget.h
 qgisinterface.h
 qgsencodingfiledialog.h
-qgslayerprojectionselector.h
+qgsgenericprojectionselector.h
 qgsmapcanvas.h
 qgsmapoverviewcanvas.h
 qgsmaptoolemitpoint.h
@@ -101,7 +101,7 @@
 qgscursors.h
 qgsencodingfiledialog.h
 qgsfiledropedit.h
-qgslayerprojectionselector.h
+qgsgenericprojectionselector.h
 qgsmapcanvas.h
 qgsmapcanvasitem.h
 qgsmapcanvasmap.h

Copied: trunk/qgis/src/gui/qgsgenericprojectionselector.cpp (from rev 9008, trunk/qgis/src/gui/qgslayerprojectionselector.cpp)
===================================================================
--- trunk/qgis/src/gui/qgsgenericprojectionselector.cpp	                        (rev 0)
+++ trunk/qgis/src/gui/qgsgenericprojectionselector.cpp	2008-08-07 00:16:37 UTC (rev 9011)
@@ -0,0 +1,101 @@
+/***************************************************************************
+                          qgsgenericprojectionselector.cpp
+                    Set user defined CRS using projection selector widget
+                             -------------------
+    begin                : May 28, 2004
+    copyright            : (C) 2004 by Gary E.Sherman
+    email                : sherman at mrcc.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+/* $Id$ */
+#include "qgsgenericprojectionselector.h"
+#include <QApplication>
+
+/**
+ * \class QgsGenericProjectionSelector 
+ * \brief A generic dialog to prompt the user for a Coordinate Reference System
+ */
+QgsGenericProjectionSelector::QgsGenericProjectionSelector(QWidget *parent, 
+                                                       Qt::WFlags fl)
+  : QDialog(parent, fl)
+{
+  setupUi(this);
+  
+
+  connect(pbnOK, SIGNAL(clicked()), this, SLOT( accept()));
+  //we will show this only when a message is set
+  textEdit->hide();
+  QApplication::restoreOverrideCursor();
+}
+
+void QgsGenericProjectionSelector::setMessage(QString theMessage)
+{
+  //short term kludge to make the layer selector default to showing
+  //a layer projection selection message. If you want the selector
+  if (theMessage.isEmpty())
+  {
+    // Set up text edit pane
+    QString format("<h2>%1</h2>%2 %3");
+    QString header = tr("Define this layer's projection:");
+    QString sentence1 = tr("This layer appears to have no projection specification.");
+    QString sentence2 = tr("By default, this layer will now have its projection set to that of the project"
+        ", but you may override this by selecting a different projection below.");
+    textEdit->setHtml(format.arg(header).arg(sentence1)
+        .arg(sentence2));
+  }
+  else
+  {
+    textEdit->setHtml(theMessage);
+  }
+  textEdit->show();
+
+}
+//! Destructor
+QgsGenericProjectionSelector::~QgsGenericProjectionSelector()
+{}
+
+void QgsGenericProjectionSelector::setSelectedSRSName(QString theName)
+{
+  projectionSelector->setSelectedSRSName(theName);
+}
+
+void QgsGenericProjectionSelector::setSelectedSRSID(long theID)
+{
+  projectionSelector->setSelectedSRSID(theID);
+}
+
+void QgsGenericProjectionSelector::setSelectedEpsg(long theID)
+{
+  projectionSelector->setSelectedEpsg(theID);
+}
+
+QString QgsGenericProjectionSelector::getSelectedProj4String()
+{
+  //@NOTE dont use getSelectedWKT as that just returns the name part!
+  return projectionSelector->getSelectedProj4String();
+}
+
+long QgsGenericProjectionSelector::getSelectedSRSID()
+{
+  //@NOTE dont use getSelectedWKT as that just returns the name part!
+  return projectionSelector->getSelectedSRSID();
+}
+
+long QgsGenericProjectionSelector::getSelectedEpsg()
+{
+  return projectionSelector->getSelectedEpsg();
+}
+
+void QgsGenericProjectionSelector::setOgcWmsCrsFilter(QSet<QString> crsFilter)
+{
+  projectionSelector->setOgcWmsCrsFilter(crsFilter);
+}
+

Copied: trunk/qgis/src/gui/qgsgenericprojectionselector.h (from rev 9008, trunk/qgis/src/gui/qgslayerprojectionselector.h)
===================================================================
--- trunk/qgis/src/gui/qgsgenericprojectionselector.h	                        (rev 0)
+++ trunk/qgis/src/gui/qgsgenericprojectionselector.h	2008-08-07 00:16:37 UTC (rev 9011)
@@ -0,0 +1,76 @@
+/***************************************************************************
+                          qgsgenericprojectionselector.h
+                Set user defined projection using projection selector widget 
+                             -------------------
+    begin                : May 28, 2004
+    copyright            : (C) 2004 by Gary E.Sherman
+    email                : sherman at mrcc.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+/* $Id$ */
+#ifndef QGSGENERICPROJECTIONSELECTOR_H
+#define QGSGENERICPROJECTIONSELECTOR_H
+#include "ui_qgsgenericprojectionselectorbase.h"
+#include "qgisgui.h"
+
+#include <QSet>
+
+/**
+ * \class QgsGenericProjectionSelector 
+ * \brief A generic dialog to prompt the user for a Coordinate Reference System
+ */
+
+class GUI_EXPORT QgsGenericProjectionSelector : public QDialog, private Ui::QgsGenericProjectionSelectorBase
+{
+  Q_OBJECT;
+  public:
+    /**
+     * Constructor
+     */
+    QgsGenericProjectionSelector(QWidget *parent = 0, 
+                               Qt::WFlags fl = QgisGui::ModalDialogFlags);
+
+    //! Destructor
+    ~QgsGenericProjectionSelector();
+
+ public slots:
+      /** If no paramter is passed, the message will be a generic
+       * 'define the CRS for this layer'.
+       */
+      void setMessage(QString theMessage="");
+      QString getSelectedProj4String();
+      long getSelectedSRSID();
+      long getSelectedEpsg();
+
+      void setSelectedSRSName(QString theName);
+      void setSelectedSRSID(long theID);
+      void setSelectedEpsg(long theID);
+
+      /**
+       * \brief filters this dialog by the given CRSs
+       *
+       * Sets this dialog to filter the available projections to those listed
+       * by the given Coordinate Reference Systems.
+       *
+       * \param crsFilter a list of OGC Coordinate Reference Systems to filter the 
+       *                  list of projections by.  This is useful in (e.g.) WMS situations
+       *                  where you just want to offer what the WMS server can support.
+       *
+       * \note This function only deals with EPSG labels only at this time.
+       *
+       * \warning This function's behaviour is undefined if it is called after the dialog is shown.
+       */
+      void setOgcWmsCrsFilter(QSet<QString> crsFilter);
+
+
+};
+
+#endif // #ifndef QGSLAYERPROJECTIONSELECTOR_H

Deleted: trunk/qgis/src/gui/qgslayerprojectionselector.cpp
===================================================================
--- trunk/qgis/src/gui/qgslayerprojectionselector.cpp	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/src/gui/qgslayerprojectionselector.cpp	2008-08-07 00:16:37 UTC (rev 9011)
@@ -1,81 +0,0 @@
-/***************************************************************************
-                          qgslayerprojectionselector.cpp
-                    Set user layerprojectionselector and preferences
-                             -------------------
-    begin                : May 28, 2004
-    copyright            : (C) 2004 by Gary E.Sherman
-    email                : sherman at mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-/* $Id$ */
-#include "qgslayerprojectionselector.h"
-#include <QApplication>
-
-/**
- * \class QgsLayerProjectionSelector - Set user layerprojectionselector and preferences
- * Constructor
- */
-QgsLayerProjectionSelector::QgsLayerProjectionSelector(QWidget *parent, 
-                                                       Qt::WFlags fl)
-  : QDialog(parent, fl)
-{
-  setupUi(this);
-  
-  // Set up text edit pane
-  QString format("<h2>%1</h2>%2 %3");
-  QString header = tr("Define this layer's projection:");
-  QString sentence1 = tr("This layer appears to have no projection specification.");
-  QString sentence2 = tr("By default, this layer will now have its projection set to that of the project"
-			 ", but you may override this by selecting a different projection below.");
-  textEdit->setHtml(format.arg(header).arg(sentence1)
-		    .arg(sentence2));
-
-  connect(pbnOK, SIGNAL(clicked()), this, SLOT( accept()));
-
-  QApplication::restoreOverrideCursor();
-}
-
-//! Destructor
-QgsLayerProjectionSelector::~QgsLayerProjectionSelector()
-{}
-
-void QgsLayerProjectionSelector::setSelectedSRSName(QString theName)
-{
-  projectionSelector->setSelectedSRSName(theName);
-}
-
-void QgsLayerProjectionSelector::setSelectedSRSID(long theID)
-{
-  projectionSelector->setSelectedSRSID(theID);
-}
-
-QString QgsLayerProjectionSelector::getCurrentProj4String()
-{
-  //@NOTE dont use getSelectedWKT as that just returns the name part!
-  return projectionSelector->getCurrentProj4String();
-}
-
-long QgsLayerProjectionSelector::getCurrentSRSID()
-{
-  //@NOTE dont use getSelectedWKT as that just returns the name part!
-  return projectionSelector->getCurrentSRSID();
-}
-
-long QgsLayerProjectionSelector::getCurrentEpsg()
-{
-  return projectionSelector->getCurrentEpsg();
-}
-
-void QgsLayerProjectionSelector::setOgcWmsCrsFilter(QSet<QString> crsFilter)
-{
-  projectionSelector->setOgcWmsCrsFilter(crsFilter);
-}
-

Deleted: trunk/qgis/src/gui/qgslayerprojectionselector.h
===================================================================
--- trunk/qgis/src/gui/qgslayerprojectionselector.h	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/src/gui/qgslayerprojectionselector.h	2008-08-07 00:16:37 UTC (rev 9011)
@@ -1,71 +0,0 @@
-/***************************************************************************
-                          qgslayerprojectionselector.h
-                        Set user layerprojectionselector and preferences
-                             -------------------
-    begin                : May 28, 2004
-    copyright            : (C) 2004 by Gary E.Sherman
-    email                : sherman at mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-/* $Id$ */
-#ifndef QGSLAYERPROJECTIONSELECTOR_H
-#define QGSLAYERPROJECTIONSELECTOR_H
-#include "ui_qgslayerprojectionselectorbase.h"
-#include "qgisgui.h"
-
-#include <QSet>
-
-/**
- * \class QgsLayerProjectionSelector
- * \brief Set Projection system for a layer
- */
-
-class GUI_EXPORT QgsLayerProjectionSelector : public QDialog, private Ui::QgsLayerProjectionSelectorBase
-{
-  Q_OBJECT;
-  public:
-    /**
-     * Constructor
-     */
-    QgsLayerProjectionSelector(QWidget *parent = 0, 
-                               Qt::WFlags fl = QgisGui::ModalDialogFlags);
-
-    //! Destructor
-    ~QgsLayerProjectionSelector();
-
- public slots:
-      QString getCurrentProj4String();
-      long getCurrentSRSID();
-      long getCurrentEpsg();
-
-      void setSelectedSRSName(QString theName);
-      void setSelectedSRSID(long theID);
-
-      /**
-       * \brief filters this dialog by the given CRSs
-       *
-       * Sets this dialog to filter the available projections to those listed
-       * by the given Coordinate Reference Systems.
-       *
-       * \param crsFilter a list of OGC Coordinate Reference Systems to filter the 
-       *                  list of projections by.  This is useful in (e.g.) WMS situations
-       *                  where you just want to offer what the WMS server can support.
-       *
-       * \note This function only deals with EPSG labels only at this time.
-       *
-       * \warning This function's behaviour is undefined if it is called after the dialog is shown.
-       */
-      void setOgcWmsCrsFilter(QSet<QString> crsFilter);
-
-
-};
-
-#endif // #ifndef QGSLAYERPROJECTIONSELECTOR_H

Modified: trunk/qgis/src/gui/qgsprojectionselector.cpp
===================================================================
--- trunk/qgis/src/gui/qgsprojectionselector.cpp	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/src/gui/qgsprojectionselector.cpp	2008-08-07 00:16:37 UTC (rev 9011)
@@ -20,6 +20,7 @@
 #include "qgis.h" //magick numbers here
 #include "qgsapplication.h"
 #include "qgslogger.h"
+#include <qgsspatialrefsys.h>
 
 //qt includes
 #include <QDir>
@@ -193,6 +194,10 @@
   // selection there
 }
 
+void QgsProjectionSelector::setSelectedEpsg(long epsg)
+{
+  //QgsSpatial
+}
 
 void QgsProjectionSelector::applySRSNameSelection()
 {
@@ -264,7 +269,7 @@
   }
 }
 // Returns the whole proj4 string for the selected projection node
-QString QgsProjectionSelector::getCurrentProj4String()
+QString QgsProjectionSelector::getSelectedProj4String()
 {
   // Only return the projection if there is a node in the tree
   // selected that has an srid. This prevents error if the user
@@ -356,7 +361,7 @@
 
 }
 
-long QgsProjectionSelector::getCurrentLongAttribute(QString attributeName)
+long QgsProjectionSelector::getSelectedLongAttribute(QString attributeName)
 {
   // Only return the attribute if there is a node in the tree
   // selected that has an srs_id.  This prevents error if the user
@@ -382,7 +387,7 @@
         myFileInfo.setFile(myDatabaseFileName);
         if ( !myFileInfo.exists( ) )
         {
-          std::cout << " QgsSpatialRefSys::createFromSrid failed :  users qgis.db not found" << std::endl;
+          std::cout << " Projection selector :  users qgis.db not found" << std::endl;
           return 0;
         }
       }
@@ -416,14 +421,14 @@
 #endif
       rc = sqlite3_prepare(db, sql.toUtf8(), sql.length(), &ppStmt, &pzTail);
       // XXX Need to free memory from the error msg if one is set
-      QString mySrid;
+      QString myAttributeValue;
       if(rc == SQLITE_OK)
       {
         // get the first row of the result set
         if(sqlite3_step(ppStmt) == SQLITE_ROW)
         {
-          // get the wkt
-          mySrid = QString::fromUtf8((char *)sqlite3_column_text(ppStmt, 0));
+          // get the attribute
+          myAttributeValue = QString::fromUtf8((char *)sqlite3_column_text(ppStmt, 0));
         }
       }
       // close the statement
@@ -431,7 +436,7 @@
       // close the database
       sqlite3_close(db);
       // return the srs wkt
-      return mySrid.toLong();
+      return myAttributeValue.toLong();
     }
   }
 
@@ -440,19 +445,19 @@
 }
 
 
-long QgsProjectionSelector::getCurrentSRID()
+long QgsProjectionSelector::getSelectedSRID()
 {
-  return getCurrentLongAttribute("srid");
+  return getSelectedLongAttribute("srid");
 }
 
 
-long QgsProjectionSelector::getCurrentEpsg()
+long QgsProjectionSelector::getSelectedEpsg()
 {
-  return getCurrentLongAttribute("epsg");
+  return getSelectedLongAttribute("epsg");
 }
 
 
-long QgsProjectionSelector::getCurrentSRSID()
+long QgsProjectionSelector::getSelectedSRSID()
 {
   QTreeWidgetItem* item = lstCoordinateSystems->currentItem();
 
@@ -705,8 +710,8 @@
   {
     // Found a real SRS
     QString myDescription;
-    emit sridSelected(QString::number(getCurrentSRSID()));
-    QString myProjString = getCurrentProj4String();
+    emit sridSelected(QString::number(getSelectedSRSID()));
+    QString myProjString = getSelectedProj4String();
     lstCoordinateSystems->scrollToItem(theItem);
     teProjection->setText(myProjString);
   }
@@ -744,7 +749,7 @@
 #endif
     //a name search is ambiguous, so we find the first srsid after the current seelcted srsid
     // each time the find button is pressed. This means we can loop through all matches.
-    if (myLargestSrsId <= getCurrentSRSID())
+    if (myLargestSrsId <= getSelectedSRSID())
     {
       //roll search around to the beginning
       mySql= "select srs_id from tbl_srs where description like '%" + mySearchString +"%'" +
@@ -754,7 +759,7 @@
     {
       // search ahead of the current postion
       mySql= "select srs_id from tbl_srs where description like '%" + mySearchString +"%'" +
-             " and srs_id > " + QString::number(getCurrentSRSID()) + " order by srs_id limit 1";
+             " and srs_id > " + QString::number(getSelectedSRSID()) + " order by srs_id limit 1";
     }
   }
 #ifdef QGISDEBUG

Modified: trunk/qgis/src/gui/qgsprojectionselector.h
===================================================================
--- trunk/qgis/src/gui/qgsprojectionselector.h	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/src/gui/qgsprojectionselector.h	2008-08-07 00:16:37 UTC (rev 9011)
@@ -65,7 +65,7 @@
       const QString stringSQLSafe(const QString theSQL);
 
       //! Gets the current EPSG-style projection identifier
-      long getCurrentEpsg();
+      long getSelectedEpsg();
 
     public slots:
       void setSelectedSRSName(QString theSRSName);
@@ -74,15 +74,15 @@
 
       void setSelectedSRSID(long theSRSID);
 
-      //void setSelectedEPSG(long epsg);
+      void setSelectedEpsg(long epsg);
 
-      QString getCurrentProj4String();
+      QString getSelectedProj4String();
 
       //! Gets the current PostGIS-style projection identifier
-      long getCurrentSRID();
+      long getSelectedSRID();
 
       //! Gets the current QGIS projection identfier
-      long getCurrentSRSID();
+      long getSelectedSRSID();
 
       /**
        * \brief filters this widget by the given CRSs
@@ -153,7 +153,7 @@
        *
        * \param attributeName   The sqlite3 column name, typically "srid" or "epsg"
        */
-      long getCurrentLongAttribute(QString attributeName);
+      long getSelectedLongAttribute(QString attributeName);
 
       /** Show the user a warning if the srs database could not be found */
       const void showDBMissingWarning(const QString theFileName);

Modified: trunk/qgis/src/plugins/grass/qgsgrassnewmapset.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassnewmapset.cpp	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/src/plugins/grass/qgsgrassnewmapset.cpp	2008-08-07 00:16:37 UTC (rev 9011)
@@ -449,7 +449,7 @@
 #endif
   setError ( mProjErrorLabel, "");
 
-  QString proj4 = mProjectionSelector->getCurrentProj4String();
+  QString proj4 = mProjectionSelector->getSelectedProj4String();
 
   // Not defined
   if ( mNoProjRadioButton->isChecked() )
@@ -568,12 +568,12 @@
   if ( mProjRadioButton->isChecked() ) 
   { 
 #ifdef QGISDEBUG
-    std::cerr << "getCurrentSRSID() = " << mProjectionSelector->getCurrentSRSID() << std::endl;
+    std::cerr << "getSelectedSRSID() = " << mProjectionSelector->getSelectedSRSID() << std::endl;
 #endif
 
-    if ( mProjectionSelector->getCurrentSRSID() > 0 )
+    if ( mProjectionSelector->getSelectedSRSID() > 0 )
     {
-      newSrs.createFromSrsId ( mProjectionSelector->getCurrentSRSID() );
+      newSrs.createFromSrsId ( mProjectionSelector->getSelectedSRSID() );
       if (  ! newSrs.isValid() )
       {
         QMessageBox::warning( 0, tr("Warning"), 
@@ -691,7 +691,7 @@
   if ( extSet && 
     ( mNoProjRadioButton->isChecked() ||
     ( mProjRadioButton->isChecked()  
-    && srsid == mProjectionSelector->getCurrentSRSID() ) 
+    && srsid == mProjectionSelector->getSelectedSRSID() ) 
     )
     )
   {
@@ -915,7 +915,7 @@
 
 
   // Warning: seems that crashes if source == dest
-  if ( mProjectionSelector->getCurrentSRSID() != 2585 )
+  if ( mProjectionSelector->getSelectedSRSID() != 2585 )
   {
     // Warning: QgsSpatialRefSys::EPSG is broken (using epsg_id)
     //QgsSpatialRefSys source ( 4326, QgsSpatialRefSys::EPSG );
@@ -928,7 +928,7 @@
       return;
     }
 
-    QgsSpatialRefSys dest ( mProjectionSelector->getCurrentSRSID(), 
+    QgsSpatialRefSys dest ( mProjectionSelector->getSelectedSRSID(), 
       QgsSpatialRefSys::QGIS_SRSID );
 
     if ( !dest.isValid() ) 
@@ -1141,9 +1141,9 @@
   points.push_back( QgsPoint( points[0] ) ); // close polygon
 
   // Warning: seems that crashes if source == dest
-  if ( mProjectionSelector->getCurrentSRSID() != 2585 )
+  if ( mProjectionSelector->getSelectedSRSID() != 2585 )
   {
-    QgsSpatialRefSys source ( mProjectionSelector->getCurrentSRSID(), 
+    QgsSpatialRefSys source ( mProjectionSelector->getSelectedSRSID(), 
       QgsSpatialRefSys::QGIS_SRSID );
 
     if ( !source.isValid() ) 

Modified: trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp
===================================================================
--- trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp	2008-08-07 00:16:37 UTC (rev 9011)
@@ -18,7 +18,7 @@
 #include "qgisinterface.h"
 #include "qgswfssourceselect.h"
 #include "qgsnewhttpconnection.h"
-#include "qgslayerprojectionselector.h"
+#include "qgsgenericprojectionselector.h"
 #include "qgshttptransaction.h"
 #include "qgscontexthelp.h"
 #include "qgsproject.h"
@@ -47,7 +47,8 @@
   connect(treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)), this, SLOT(changeCRSFilter()));
   populateConnectionList();
 
-  mProjectionSelector = new QgsLayerProjectionSelector(this);
+  mProjectionSelector = new QgsGenericProjectionSelector(this);
+  mProjectionSelector->setMessage();
 }
 
 QgsWFSSourceSelect::~QgsWFSSourceSelect()
@@ -354,7 +355,7 @@
   QString crsString;
   if(mProjectionSelector)
     {
-      long epsgNr = mProjectionSelector->getCurrentEpsg();
+      long epsgNr = mProjectionSelector->getSelectedEpsg();
       if(epsgNr != 0)
 	{
 	  crsString = "&SRSNAME=EPSG:"+QString::number(epsgNr);
@@ -372,7 +373,7 @@
 {
   if(mProjectionSelector->exec())
     {
-      QString crsString = "EPSG: " + QString::number(mProjectionSelector->getCurrentEpsg());
+      QString crsString = "EPSG: " + QString::number(mProjectionSelector->getSelectedEpsg());
       labelCoordRefSys->setText(crsString);
     }
 }

Modified: trunk/qgis/src/plugins/wfs/qgswfssourceselect.h
===================================================================
--- trunk/qgis/src/plugins/wfs/qgswfssourceselect.h	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/src/plugins/wfs/qgswfssourceselect.h	2008-08-07 00:16:37 UTC (rev 9011)
@@ -21,7 +21,7 @@
 #include "ui_qgswfssourceselectbase.h"
 
 class QgisInterface;
-class QgsLayerProjectionSelector;
+class QgsGenericProjectionSelector;
 
 class QgsWFSSourceSelect: public QDialog, private Ui::QgsWFSSourceSelectBase
 {
@@ -42,7 +42,7 @@
   QgsWFSSourceSelect(); //default constructor is forbidden
   QgisInterface* mIface; //pointer to the QGIS interface object (needed to add WFS layers)
   QString mUri; //uri of the currently connected server
-  QgsLayerProjectionSelector* mProjectionSelector;
+  QgsGenericProjectionSelector* mProjectionSelector;
   /**Stores the available CRS for a server connections.
    The first string is the typename, the corresponding list
   stores the CRS for the typename in the form 'EPSG:XXXX'*/

Modified: trunk/qgis/src/ui/CMakeLists.txt
===================================================================
--- trunk/qgis/src/ui/CMakeLists.txt	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/src/ui/CMakeLists.txt	2008-08-07 00:16:37 UTC (rev 9011)
@@ -23,7 +23,7 @@
   qgshelpviewerbase.ui
   qgsidentifyresultsbase.ui
   qgslabeldialogbase.ui
-  qgslayerprojectionselectorbase.ui
+  qgsgenericprojectionselectorbase.ui
   qgsludialogbase.ui
   qgsmeasurebase.ui
   qgsmessageviewer.ui

Copied: trunk/qgis/src/ui/qgsgenericprojectionselectorbase.ui (from rev 9008, trunk/qgis/src/ui/qgslayerprojectionselectorbase.ui)
===================================================================
--- trunk/qgis/src/ui/qgsgenericprojectionselectorbase.ui	                        (rev 0)
+++ trunk/qgis/src/ui/qgsgenericprojectionselectorbase.ui	2008-08-07 00:16:37 UTC (rev 9011)
@@ -0,0 +1,107 @@
+<ui version="4.0" >
+ <class>QgsGenericProjectionSelectorBase</class>
+ <widget class="QDialog" name="QgsGenericProjectionSelectorBase" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>605</width>
+    <height>563</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Projection Selector</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset/>
+  </property>
+  <property name="modal" >
+   <bool>true</bool>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>9</number>
+   </property>
+   <property name="topMargin" >
+    <number>9</number>
+   </property>
+   <property name="rightMargin" >
+    <number>9</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>9</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
+   <item row="1" column="0" colspan="2" >
+    <widget class="QgsProjectionSelector" native="1" name="projectionSelector" />
+   </item>
+   <item row="0" column="0" colspan="2" >
+    <widget class="QTextEdit" name="textEdit" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize" >
+      <size>
+       <width>16777215</width>
+       <height>160</height>
+      </size>
+     </property>
+     <property name="focusPolicy" >
+      <enum>Qt::NoFocus</enum>
+     </property>
+     <property name="acceptDrops" >
+      <bool>false</bool>
+     </property>
+     <property name="lineWidth" >
+      <number>2</number>
+     </property>
+     <property name="readOnly" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>221</width>
+       <height>21</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QPushButton" name="pbnOK" >
+     <property name="text" >
+      <string>OK</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <customwidgets>
+  <customwidget>
+   <class>QgsProjectionSelector</class>
+   <extends>QWidget</extends>
+   <header>qgsprojectionselector.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

Deleted: trunk/qgis/src/ui/qgslayerprojectionselectorbase.ui
===================================================================
--- trunk/qgis/src/ui/qgslayerprojectionselectorbase.ui	2008-08-06 21:32:21 UTC (rev 9010)
+++ trunk/qgis/src/ui/qgslayerprojectionselectorbase.ui	2008-08-07 00:16:37 UTC (rev 9011)
@@ -1,97 +0,0 @@
-<ui version="4.0" >
- <class>QgsLayerProjectionSelectorBase</class>
- <widget class="QDialog" name="QgsLayerProjectionSelectorBase" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>605</width>
-    <height>563</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Layer Projection Selector</string>
-  </property>
-  <property name="windowIcon" >
-   <iconset/>
-  </property>
-  <property name="modal" >
-   <bool>true</bool>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="1" column="0" colspan="2" >
-    <widget class="QgsProjectionSelector" native="1" name="projectionSelector" />
-   </item>
-   <item row="0" column="0" colspan="2" >
-    <widget class="QTextEdit" name="textEdit" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>5</hsizetype>
-       <vsizetype>5</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="maximumSize" >
-      <size>
-       <width>16777215</width>
-       <height>160</height>
-      </size>
-     </property>
-     <property name="focusPolicy" >
-      <enum>Qt::NoFocus</enum>
-     </property>
-     <property name="acceptDrops" >
-      <bool>false</bool>
-     </property>
-     <property name="lineWidth" >
-      <number>2</number>
-     </property>
-     <property name="readOnly" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>221</width>
-       <height>21</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="1" >
-    <widget class="QPushButton" name="pbnOK" >
-     <property name="text" >
-      <string>OK</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <customwidgets>
-  <customwidget>
-   <class>QgsProjectionSelector</class>
-   <extends>QWidget</extends>
-   <header>qgsprojectionselector.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>



More information about the QGIS-commit mailing list