[QGIS Commit] r14668 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2010-11-14 14:45:26 -0800 (Sun, 14 Nov 2010)
New Revision: 14668

Modified:
   trunk/qgis/src/app/qgsvectorlayerproperties.cpp
   trunk/qgis/src/app/qgsvectorlayerproperties.h
Log:
Fix broken activation of label dialog

Modified: trunk/qgis/src/app/qgsvectorlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2010-11-14 22:45:20 UTC (rev 14667)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2010-11-14 22:45:26 UTC (rev 14668)
@@ -517,6 +517,7 @@
 
   loadRows();
   QObject::connect( tblAttributes, SIGNAL( cellChanged( int, int ) ), this, SLOT( on_tblAttributes_cellChanged( int, int ) ) );
+  QObject::connect( labelCheckBox, SIGNAL( clicked( bool ) ), this, SLOT( enableLabelOptions( bool ) ) );
 } // reset()
 
 
@@ -1258,3 +1259,8 @@
   teMetadata->setHtml( metadata() );
   mMetadataFilled = true;
 }
+
+void QgsVectorLayerProperties::enableLabelOptions( bool theFlag )
+{
+  labelOptionsFrame->setEnabled( theFlag );
+}

Modified: trunk/qgis/src/app/qgsvectorlayerproperties.h
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.h	2010-11-14 22:45:20 UTC (rev 14667)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.h	2010-11-14 22:45:26 UTC (rev 14668)
@@ -107,6 +107,7 @@
     void on_tabWidget_currentChanged( int idx );
     void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
 
+    void enableLabelOptions( bool theFlag );
     void addAttribute();
     void deleteAttribute();