[QGIS Commit] r12415 - in trunk/qgis/src: app/composer ui

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-12-11 17:40:15 -0500 (Fri, 11 Dec 2009)
New Revision: 12415

Modified:
   trunk/qgis/src/app/composer/qgscomposer.h
   trunk/qgis/src/ui/qgscomposerbase.ui
Log:
fix #2240

Modified: trunk/qgis/src/app/composer/qgscomposer.h
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.h	2009-12-11 22:17:54 UTC (rev 12414)
+++ trunk/qgis/src/app/composer/qgscomposer.h	2009-12-11 22:40:15 UTC (rev 12415)
@@ -238,7 +238,7 @@
     //! Raise, unminimize and activate this window
     void activate();
 
-    void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
+    void on_mButtonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
 
   private:
 

Modified: trunk/qgis/src/ui/qgscomposerbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerbase.ui	2009-12-11 22:17:54 UTC (rev 12414)
+++ trunk/qgis/src/ui/qgscomposerbase.ui	2009-12-11 22:40:15 UTC (rev 12415)
@@ -136,7 +136,7 @@
     <item row="1" column="0">
      <widget class="QDialogButtonBox" name="mButtonBox">
       <property name="standardButtons">
-       <set>QDialogButtonBox::Close</set>
+       <set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
       </property>
      </widget>
     </item>