Skip to content
Permalink
Browse files

[composer] Remove 'new from template' action from composer, following…

… UI list discussions
  • Loading branch information
nyalldawson committed Oct 1, 2014
1 parent 78c88d5 commit d66e4dc17548cac544ea8665318611fd37c0ef94
Showing with 1 addition and 20 deletions.
  1. +0 −7 src/app/composer/qgscomposer.cpp
  2. +0 −4 src/app/composer/qgscomposer.h
  3. +1 −9 src/ui/qgscomposerbase.ui
@@ -213,7 +213,6 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
composerMenu->addMenu( mPrintComposersMenu );

composerMenu->addSeparator();
composerMenu->addAction( mActionNewFromTemplate );
composerMenu->addAction( mActionLoadFromTemplate );
composerMenu->addAction( mActionSaveAsTemplate );
composerMenu->addSeparator();
@@ -646,7 +645,6 @@ void QgsComposer::setupTheme()
mActionNewComposer->setIcon( QgsApplication::getThemeIcon( "/mActionNewComposer.svg" ) );
mActionDuplicateComposer->setIcon( QgsApplication::getThemeIcon( "/mActionDuplicateComposer.svg" ) );
mActionComposerManager->setIcon( QgsApplication::getThemeIcon( "/mActionComposerManager.svg" ) );
mActionNewFromTemplate->setIcon( QgsApplication::getThemeIcon( "/mActionNewComposer.svg" ) );
mActionLoadFromTemplate->setIcon( QgsApplication::getThemeIcon( "/mActionFileOpen.svg" ) );
mActionSaveAsTemplate->setIcon( QgsApplication::getThemeIcon( "/mActionFileSaveAs.svg" ) );
mActionExportAsImage->setIcon( QgsApplication::getThemeIcon( "/mActionSaveMapAsImage.png" ) );
@@ -2557,11 +2555,6 @@ void QgsComposer::on_mActionSaveAsTemplate_triggered()
}
}

void QgsComposer::on_mActionNewFromTemplate_triggered()
{
loadTemplate( true );
}

void QgsComposer::on_mActionLoadFromTemplate_triggered()
{
loadTemplate( false );
@@ -217,10 +217,6 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
//! Save composer as template
void on_mActionSaveAsTemplate_triggered();

//! Load template into blank composer
//! @note added in 1.9
void on_mActionNewFromTemplate_triggered();

void on_mActionLoadFromTemplate_triggered();

//! Set tool to move item content
@@ -741,14 +741,6 @@
<string>Duplicate composer</string>
</property>
</action>
<action name="mActionNewFromTemplate">
<property name="text">
<string>New from Template</string>
</property>
<property name="toolTip">
<string>New from template</string>
</property>
</action>
<action name="mActionLockItems">
<property name="icon">
<iconset resource="../../images/images.qrc">
@@ -1004,8 +996,8 @@
</action>
</widget>
<resources>
<include location="../../python/plugins/fTools/resources.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../python/plugins/fTools/resources.qrc"/>
</resources>
<connections/>
</ui>

0 comments on commit d66e4dc

Please sign in to comment.
You can’t perform that action at this time.