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

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-09-26 09:09:55 -0400 (Fri, 26 Sep 2008)
New Revision: 9410

Modified:
   trunk/qgis/src/app/composer/qgscomposer.cpp
   trunk/qgis/src/ui/qgscomposerbase.ui
Log:
Removed template buttons in composer

Modified: trunk/qgis/src/app/composer/qgscomposer.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.cpp	2008-09-26 13:02:30 UTC (rev 9409)
+++ trunk/qgis/src/app/composer/qgscomposer.cpp	2008-09-26 13:09:55 UTC (rev 9410)
@@ -118,10 +118,6 @@
 
   setWindowTitle( tr( "QGIS - print composer" ) );
 
-  // Template save and load is not yet implemented, so disable those actions
-  mActionOpenTemplate->setEnabled( false );
-  mActionSaveTemplateAs->setEnabled( false );
-
   mActionAddNewMap->setCheckable( true );
   mActionAddNewLabel->setCheckable( true );
   mActionAddNewLegend->setCheckable( true );
@@ -251,8 +247,6 @@
 {
   //now set all the icons - getThemeIcon will fall back to default theme if its
   //missing from active theme
-  mActionOpenTemplate->setIcon( QgisApp::getThemeIcon( "/mActionFileOpen.png" ) );
-  mActionSaveTemplateAs->setIcon( QgisApp::getThemeIcon( "/mActionFileSaveAs.png" ) );
   mActionExportAsImage->setIcon( QgisApp::getThemeIcon( "/mActionExportMapServer.png" ) );
   mActionExportAsSVG->setIcon( QgisApp::getThemeIcon( "/mActionSaveAsSVG.png" ) );
   mActionPrint->setIcon( QgisApp::getThemeIcon( "/mActionFilePrint.png" ) );

Modified: trunk/qgis/src/ui/qgscomposerbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerbase.ui	2008-09-26 13:02:30 UTC (rev 9409)
+++ trunk/qgis/src/ui/qgscomposerbase.ui	2008-09-26 13:09:55 UTC (rev 9410)
@@ -229,8 +229,6 @@
    <attribute name="toolBarBreak" >
     <bool>false</bool>
    </attribute>
-   <addaction name="mActionOpenTemplate" />
-   <addaction name="mActionSaveTemplateAs" />
    <addaction name="mActionExportAsImage" />
    <addaction name="mActionExportAsSVG" />
    <addaction name="mActionPrint" />
@@ -247,22 +245,6 @@
    <addaction name="mActionAddNewScalebar" />
    <addaction name="mActionSelectMoveItem" />
   </widget>
-  <action name="mActionOpenTemplate" >
-   <property name="icon" >
-    <iconset>../themes/default/mActionFileOpen.png</iconset>
-   </property>
-   <property name="text" >
-    <string>&amp;Open Template...</string>
-   </property>
-  </action>
-  <action name="mActionSaveTemplateAs" >
-   <property name="icon" >
-    <iconset>../themes/default/mActionFileSaveAs.png</iconset>
-   </property>
-   <property name="text" >
-    <string>Save Template &amp;As...</string>
-   </property>
-  </action>
   <action name="mActionPrint" >
    <property name="icon" >
     <iconset>../themes/default/mActionFilePrint.png</iconset>