Redirect default layout template button to configured folder

m-kuhn · m-kuhn · commit ae3b39bd1eb1 · 2019-06-04T08:03:43.000+02:00
The "Default templates" button in the layout manager now 1. checks if there is a composer_templates folder in the app dir 2. if not, redirects to the first configured composer templates folder 3. if no composer templates folder is configured, it's deactivated Fix #30064
diff --git a/src/app/layout/qgslayoutmanagerdialog.cpp b/src/app/layout/qgslayoutmanagerdialog.cpp
@@ -101,6 +101,8 @@ QgsLayoutManagerDialog::QgsLayoutManagerDialog( QWidget *parent, Qt::WindowFlags
   addTemplates( defaultTemplateMap );
   addTemplates( otherTemplates() );
 
+  mTemplatesDefaultDirBtn->setToolTip( tr( "Use <i>Settings --> Options --> Layouts --> Layout Paths</i> to configure the folders in which QGIS will search for print layout templates." ) );
+
   toggleButtons();
 }
 
@@ -148,6 +150,7 @@ void QgsLayoutManagerDialog::addTemplates( const QMap<QString, QString> &templat
 
 void QgsLayoutManagerDialog::activate()
 {
+  updateTemplateButtonEnabledState();
   raise();
   setWindowState( windowState() & ~Qt::WindowMinimized );
   activateWindow();
@@ -163,9 +166,8 @@ QMap<QString, QString> QgsLayoutManagerDialog::defaultTemplates( bool fromUser )
 QMap<QString, QString> QgsLayoutManagerDialog::otherTemplates() const
 {
   QMap<QString, QString> templateMap;
-  QStringList paths = QgsApplication::layoutTemplatePaths();
-  const auto constPaths = paths;
-  for ( const QString &path : constPaths )
+  const QStringList paths = QgsApplication::layoutTemplatePaths();
+  for ( const QString &path : paths )
   {
     QMap<QString, QString> templates = templatesFromPath( path );
     QMap<QString, QString>::const_iterator templateIt = templates.constBegin();
@@ -285,7 +287,14 @@ void QgsLayoutManagerDialog::mTemplate_currentIndexChanged( int indx )
 
 void QgsLayoutManagerDialog::mTemplatesDefaultDirBtn_pressed()
 {
-  openLocalDirectory( mDefaultTemplatesDir );
+  if ( QDir( mDefaultTemplatesDir ).exists() )
+    openLocalDirectory( mDefaultTemplatesDir );
+  else
+  {
+    const QStringList paths = QgsApplication::layoutTemplatePaths();
+    if ( !paths.empty() )
+      openLocalDirectory( paths.at( 0 ) );
+  }
 }
 
 void QgsLayoutManagerDialog::mTemplatesUserDirBtn_pressed()
@@ -331,6 +340,11 @@ void QgsLayoutManagerDialog::openLocalDirectory( const QString &localDirPath )
   }
 }
 
+void QgsLayoutManagerDialog::updateTemplateButtonEnabledState()
+{
+  mTemplatesDefaultDirBtn->setEnabled( QDir( mDefaultTemplatesDir ).exists() || !QgsApplication::layoutTemplatePaths().empty() );
+}
+
 #ifdef Q_OS_MAC
 void QgsLayoutManagerDialog::showEvent( QShowEvent *event )
 {
diff --git a/src/app/layout/qgslayoutmanagerdialog.h b/src/app/layout/qgslayoutmanagerdialog.h
@@ -48,18 +48,20 @@ class QgsLayoutManagerDialog: public QDialog, private Ui::QgsLayoutManagerBase
 
     /**
      * Returns the default templates (key: template name, value: absolute path to template file)
-     * \param fromUser whether to return user templates from ~/.qgis/composer_templates
+     * \param fromUser whether to return user templates from [profile folder]/composer_templates
      */
     QMap<QString, QString> defaultTemplates( bool fromUser = false ) const;
     QMap<QString, QString> otherTemplates() const;
 
     QMap<QString, QString> templatesFromPath( const QString &path ) const;
 
     /**
-     * Open local directory with user's system, creating it if not present
+     * Opens local directory with user's system and tries to create it if not present
      */
     void openLocalDirectory( const QString &localDirPath );
 
+    void updateTemplateButtonEnabledState();
+
     QString mDefaultTemplatesDir;
     QString mUserTemplatesDir;
     QPushButton *mCreateReportButton = nullptr;

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,8 @@ QgsLayoutManagerDialog::QgsLayoutManagerDialog( QWidget *parent, Qt::WindowFlags`
`101`	`101`	`addTemplates( defaultTemplateMap );`
`102`	`102`	`addTemplates( otherTemplates() );`
`103`	`103`
	`104`	`+ mTemplatesDefaultDirBtn->setToolTip( tr( "Use <i>Settings --> Options --> Layouts --> Layout Paths</i> to configure the folders in which QGIS will search for print layout templates." ) );`
	`105`	`+`
`104`	`106`	`toggleButtons();`
`105`	`107`	`}`
`106`	`108`
`@@ -148,6 +150,7 @@ void QgsLayoutManagerDialog::addTemplates( const QMap<QString, QString> &templat`
`148`	`150`
`149`	`151`	`void QgsLayoutManagerDialog::activate()`
`150`	`152`	`{`
	`153`	`+ updateTemplateButtonEnabledState();`
`151`	`154`	`raise();`
`152`	`155`	`setWindowState( windowState() & ~Qt::WindowMinimized );`
`153`	`156`	`activateWindow();`
`@@ -163,9 +166,8 @@ QMap<QString, QString> QgsLayoutManagerDialog::defaultTemplates( bool fromUser )`
`163`	`166`	`QMap<QString, QString> QgsLayoutManagerDialog::otherTemplates() const`
`164`	`167`	`{`
`165`	`168`	`QMap<QString, QString> templateMap;`
`166`		`- QStringList paths = QgsApplication::layoutTemplatePaths();`
`167`		`- const auto constPaths = paths;`
`168`		`- for ( const QString &path : constPaths )`
	`169`	`+ const QStringList paths = QgsApplication::layoutTemplatePaths();`
	`170`	`+ for ( const QString &path : paths )`
`169`	`171`	`{`
`170`	`172`	`QMap<QString, QString> templates = templatesFromPath( path );`
`171`	`173`	`QMap<QString, QString>::const_iterator templateIt = templates.constBegin();`
`@@ -285,7 +287,14 @@ void QgsLayoutManagerDialog::mTemplate_currentIndexChanged( int indx )`
`285`	`287`
`286`	`288`	`void QgsLayoutManagerDialog::mTemplatesDefaultDirBtn_pressed()`
`287`	`289`	`{`
`288`		`- openLocalDirectory( mDefaultTemplatesDir );`
	`290`	`+ if ( QDir( mDefaultTemplatesDir ).exists() )`
	`291`	`+ openLocalDirectory( mDefaultTemplatesDir );`
	`292`	`+ else`
	`293`	`+ {`
	`294`	`+ const QStringList paths = QgsApplication::layoutTemplatePaths();`
	`295`	`+ if ( !paths.empty() )`
	`296`	`+ openLocalDirectory( paths.at( 0 ) );`
	`297`	`+ }`
`289`	`298`	`}`
`290`	`299`
`291`	`300`	`void QgsLayoutManagerDialog::mTemplatesUserDirBtn_pressed()`
`@@ -331,6 +340,11 @@ void QgsLayoutManagerDialog::openLocalDirectory( const QString &localDirPath )`
`331`	`340`	`}`
`332`	`341`	`}`
`333`	`342`
	`343`	`+void QgsLayoutManagerDialog::updateTemplateButtonEnabledState()`
	`344`	`+{`
	`345`	`+ mTemplatesDefaultDirBtn->setEnabled( QDir( mDefaultTemplatesDir ).exists() \|\| !QgsApplication::layoutTemplatePaths().empty() );`
	`346`	`+}`
	`347`	`+`
`334`	`348`	`#ifdef Q_OS_MAC`
`335`	`349`	`void QgsLayoutManagerDialog::showEvent( QShowEvent *event )`
`336`	`350`	`{`