fixed ticket 45 - new field does not appear in vector label propertie…

…s dialog git-svn-id: http://svn.osgeo.org/qgis/trunk@5686 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 10, 2006 · a148dcc · a148dcc
1 parent d24fadd
commit a148dcc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/src/gui/qgslabel.cpp b/src/gui/qgslabel.cpp
@@ -418,6 +418,11 @@ void QgsLabel::addRequiredFields ( std::list<int> *fields )
     }
 }
 
+void QgsLabel::setFields( std::vector<QgsField> const & fields  )
+{
+    mField = fields;
+}
+
 std::vector<QgsField> & QgsLabel::fields ( void )
 {
     return mField;

diff --git a/src/gui/qgslabel.h b/src/gui/qgslabel.h
@@ -89,6 +89,9 @@ class QgsLabel
     //! add vector of required fields to existing list of fields
     void addRequiredFields ( std::list<int> *fields );
 
+    //! Set available fields
+    void setFields( std::vector<QgsField> const & fields  );
+
     //! Available vector fields
     std::vector<QgsField> & fields ( void );
 

diff --git a/src/gui/qgsvectorlayerproperties.cpp b/src/gui/qgsvectorlayerproperties.cpp
@@ -21,6 +21,7 @@
 #include "qgsattributeactiondialog.h"
 #include "qgscontinuouscolordialog.h"
 #include "qgsgraduatedsymboldialog.h"
+#include "qgslabel.h"
 #include "qgslabeldialog.h"
 #include "qgslayerprojectionselector.h"
 #include "qgssinglesymboldialog.h"
@@ -208,6 +209,8 @@ void QgsVectorLayerProperties::reset( void )
 
   QObject::connect(legendtypecombobox, SIGNAL(activated(const QString &)), this, SLOT(alterLayerDialog(const QString &)));
 
+  // reset fields in label dialog
+  layer->label()->setFields ( layer->fields() );
 
   //set the metadata contents
   teMetadata->setText(getMetadata());