[QGIS Commit] r12612 - trunk/qgis/src/app/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-12-24 03:52:09 -0500 (Thu, 24 Dec 2009)
New Revision: 12612

Modified:
   trunk/qgis/src/app/composer/qgscomposer.cpp
   trunk/qgis/src/app/composer/qgscomposer.h
Log:
Don't read composer title from template. Fixes bug #2311

Modified: trunk/qgis/src/app/composer/qgscomposer.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.cpp	2009-12-24 08:37:52 UTC (rev 12611)
+++ trunk/qgis/src/app/composer/qgscomposer.cpp	2009-12-24 08:52:09 UTC (rev 12612)
@@ -1098,19 +1098,18 @@
   {
     return;
   }
-  readXML( composerNodeList.at( 0 ).toElement(), doc );
+  readXML( composerNodeList.at( 0 ).toElement(), doc, true );
 }
 
-void QgsComposer::readXML( const QDomElement& composerElem, const QDomDocument& doc )
+void QgsComposer::readXML( const QDomElement& composerElem, const QDomDocument& doc, bool fromTemplate )
 {
-  // Create action to select this window
-  delete mWindowAction;
-  mWindowAction = new QAction( windowTitle(), this );
-  connect( mWindowAction, SIGNAL( triggered() ), this, SLOT( activate() ) );
-
-  if ( composerElem.hasAttribute( "title" ) )
+  // Set title only if reading from project file
+  if ( !fromTemplate )
   {
-    setTitle( composerElem.attribute( "title", tr( "Composer" ) ) );
+    if ( composerElem.hasAttribute( "title" ) )
+    {
+      setTitle( composerElem.attribute( "title", tr( "Composer" ) ) );
+    }
   }
 
   //delete composer view and composition

Modified: trunk/qgis/src/app/composer/qgscomposer.h
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.h	2009-12-24 08:37:52 UTC (rev 12611)
+++ trunk/qgis/src/app/composer/qgscomposer.h	2009-12-24 08:52:09 UTC (rev 12612)
@@ -231,7 +231,7 @@
 
     //! Sets state from Dom document
     void readXML( const QDomDocument& doc );
-    void readXML( const QDomElement& composerElem, const QDomDocument& doc );
+    void readXML( const QDomElement& composerElem, const QDomDocument& doc, bool fromTemplate = false );
 
     void setSelectionTool();