[composer] Allow choosing *.htm and *.* files for html item source (sponsored by City of Uster, Switzerland)

nyalldawson · nyalldawson · commit 86304b907dec · 2014-04-28T20:24:57.000+10:00
diff --git a/src/app/composer/qgscomposerhtmlwidget.cpp b/src/app/composer/qgscomposerhtmlwidget.cpp
@@ -87,7 +87,7 @@ void QgsComposerHtmlWidget::on_mFileToolButton_clicked()
 {
   QSettings s;
   QString lastDir = s.value( "/UI/lastHtmlDir", "" ).toString();
-  QString file = QFileDialog::getOpenFileName( this, tr( "Select HTML document" ), lastDir, "HTML (*.html)" );
+  QString file = QFileDialog::getOpenFileName( this, tr( "Select HTML document" ), lastDir, "HTML (*.html *.htm);;All files (*.*)" );
   if ( !file.isEmpty() )
   {
     QUrl url = QUrl::fromLocalFile( file );

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ void QgsComposerHtmlWidget::on_mFileToolButton_clicked()`
`87`	`87`	`{`
`88`	`88`	`QSettings s;`
`89`	`89`	`QString lastDir = s.value( "/UI/lastHtmlDir", "" ).toString();`
`90`		`- QString file = QFileDialog::getOpenFileName( this, tr( "Select HTML document" ), lastDir, "HTML (*.html)" );`
	`90`	`+ QString file = QFileDialog::getOpenFileName( this, tr( "Select HTML document" ), lastDir, "HTML (.html .htm);;All files (.)" );`
`91`	`91`	`if ( !file.isEmpty() )`
`92`	`92`	`{`
`93`	`93`	`QUrl url = QUrl::fromLocalFile( file );`