[composer] Add shortcut to atlas settings to atlas toolbar and menu. …

…Designed to make atlas features more discoverable for beginners
qgis · Jan 1, 2014 · 8a11be8 · 8a11be8
1 parent eb241a6
commit 8a11be8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -320,6 +320,8 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   atlasMenu->addAction( mActionExportAtlasAsImage );
   atlasMenu->addAction( mActionExportAtlasAsSVG );
   atlasMenu->addAction( mActionExportAtlasAsPDF );
+  atlasMenu->addSeparator();
+  atlasMenu->addAction( mActionAtlasSettings );
 
   QToolButton* atlasExportToolButton = new QToolButton( mAtlasToolbar );
   atlasExportToolButton->setPopupMode( QToolButton::InstantPopup );
@@ -329,7 +331,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   atlasExportToolButton->addAction( mActionExportAtlasAsSVG );
   atlasExportToolButton->addAction( mActionExportAtlasAsPDF );
   atlasExportToolButton->setDefaultAction( mActionExportAtlasAsImage );
-  mAtlasToolbar->addWidget( atlasExportToolButton );
+  mAtlasToolbar->insertWidget( mActionAtlasSettings, atlasExportToolButton );
 
   QMenu *settingsMenu = menuBar()->addMenu( tr( "Settings" ) );
   settingsMenu->addAction( mActionOptions );
@@ -1059,6 +1061,16 @@ void QgsComposer::toggleRulers( bool checked )
   myQSettings.setValue( "/Composer/showRulers", checked );
 }
 
+void QgsComposer::on_mActionAtlasSettings_triggered()
+{
+  if ( !mAtlasDock->isVisible() )
+  {
+    mAtlasDock->show();
+  }
+
+  mAtlasDock->raise();
+}
+
 void QgsComposer::on_mActionExportAtlasAsPDF_triggered()
 {
   exportCompositionAsPDF( QgsComposer::Atlas );

diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -349,6 +349,9 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     //! Print atlas as PDF
     void on_mActionExportAtlasAsPDF_triggered();
 
+    //! Atlas settings
+    void on_mActionAtlasSettings_triggered();
+
     //! Save window state
     void saveWindowState();
 

diff --git a/src/ui/qgscomposerbase.ui b/src/ui/qgscomposerbase.ui
@@ -145,6 +145,7 @@
    <addaction name="mActionAtlasNext"/>
    <addaction name="mActionAtlasLast"/>
    <addaction name="mActionPrintAtlas"/>
+   <addaction name="mActionAtlasSettings"/>
   </widget>
   <action name="mActionPrint">
    <property name="checkable">
@@ -927,6 +928,15 @@
     <string>Export Atlas As PDF...</string>
    </property>
   </action>
+  <action name="mActionAtlasSettings">
+   <property name="icon">
+    <iconset resource="../../images/images.qrc">
+     <normaloff>:/images/themes/default/mActionSetProjection.svg</normaloff>:/images/themes/default/mActionSetProjection.svg</iconset>
+   </property>
+   <property name="text">
+    <string>Atlas Settings</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="../../images/images.qrc"/>