From 36992b3ba66a764fa6dd2ea15194262b06310ed8 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Mon, 13 Jul 2015 16:07:02 +1000 Subject: [PATCH] Standardise capitalisation of HTML string (refs #7050) --- src/app/composer/qgscomposerhtmlwidget.cpp | 2 +- src/app/qgstipfactory.cpp | 2 +- src/core/composer/qgscomposerhtml.cpp | 2 +- src/gui/qgscomposerview.cpp | 4 ++-- src/gui/qgsmaptoolidentify.cpp | 2 +- src/ui/qgisapp.ui | 6 +++--- src/ui/qgscomposerbase.ui | 15 +++------------ 7 files changed, 12 insertions(+), 21 deletions(-) diff --git a/src/app/composer/qgscomposerhtmlwidget.cpp b/src/app/composer/qgscomposerhtmlwidget.cpp index 9228880d7ff9..311fce82d4bc 100644 --- a/src/app/composer/qgscomposerhtmlwidget.cpp +++ b/src/app/composer/qgscomposerhtmlwidget.cpp @@ -122,7 +122,7 @@ void QgsComposerHtmlWidget::on_mUrlLineEdit_editingFinished() QgsComposition* composition = mHtml->composition(); if ( composition ) { - composition->beginMultiFrameCommand( mHtml, tr( "Change html url" ) ); + composition->beginMultiFrameCommand( mHtml, tr( "Change HTML url" ) ); mHtml->setUrl( newUrl ); mHtml->update(); composition->endMultiFrameCommand(); diff --git a/src/app/qgstipfactory.cpp b/src/app/qgstipfactory.cpp index 5ec383610659..fb520c0f2b82 100644 --- a/src/app/qgstipfactory.cpp +++ b/src/app/qgstipfactory.cpp @@ -196,7 +196,7 @@ QgsTipFactory::QgsTipFactory() : QObject() myTip.setTitle( tr( "Add an action to layer" ) ); myTip.setContent( tr( "Action in a layer allow user to trigger action when clicking on a geometry" " with 'Run Feature Action' tools." - "For example, you can open an html page using the field value of the geometry " + "For example, you can open a HTML page using the field value of the geometry " "as a parameter. Look at the documentation." ) ); addGuiTip( myTip ); diff --git a/src/core/composer/qgscomposerhtml.cpp b/src/core/composer/qgscomposerhtml.cpp index 8e030f96edc5..b36e00002ea9 100644 --- a/src/core/composer/qgscomposerhtml.cpp +++ b/src/core/composer/qgscomposerhtml.cpp @@ -454,7 +454,7 @@ void QgsComposerHtml::setUserStylesheetEnabled( const bool stylesheetEnabled ) QString QgsComposerHtml::displayName() const { - return tr( "" ); + return tr( "" ); } bool QgsComposerHtml::writeXML( QDomElement& elem, QDomDocument & doc, bool ignoreFrames ) const diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp index 12654c5bf043..65bcae961740 100644 --- a/src/gui/qgscomposerview.cpp +++ b/src/gui/qgscomposerview.cpp @@ -937,12 +937,12 @@ void QgsComposerView::mouseReleaseEvent( QMouseEvent* e ) { QgsComposerHtml* composerHtml = new QgsComposerHtml( composition(), true ); QgsAddRemoveMultiFrameCommand* command = new QgsAddRemoveMultiFrameCommand( QgsAddRemoveMultiFrameCommand::Added, - composerHtml, composition(), tr( "Html item added" ) ); + composerHtml, composition(), tr( "HTML item added" ) ); composition()->undoStack()->push( command ); QgsComposerFrame* frame = new QgsComposerFrame( composition(), composerHtml, mRubberBandItem->transform().dx(), mRubberBandItem->transform().dy(), mRubberBandItem->rect().width(), mRubberBandItem->rect().height() ); - composition()->beginMultiFrameCommand( composerHtml, tr( "Html frame added" ) ); + composition()->beginMultiFrameCommand( composerHtml, tr( "HTML frame added" ) ); composerHtml->addFrame( frame ); composition()->endMultiFrameCommand(); diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp index 2f4430055ca3..20bede9d8d54 100644 --- a/src/gui/qgsmaptoolidentify.cpp +++ b/src/gui/qgsmaptoolidentify.cpp @@ -525,7 +525,7 @@ bool QgsMapToolIdentify::identifyRasterLayer( QList *results, Qg } else // text or html { - QgsDebugMsg( QString( "%1 html or text values" ).arg( values.size() ) ); + QgsDebugMsg( QString( "%1 HTML or text values" ).arg( values.size() ) ); foreach ( int bandNo, values.keys() ) { QString value = values.value( bandNo ).toString(); diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui index 08391c307828..22bddeea9191 100755 --- a/src/ui/qgisapp.ui +++ b/src/ui/qgisapp.ui @@ -17,7 +17,7 @@ 0 0 1050 - 27 + 25 @@ -1908,10 +1908,10 @@ Acts on currently active editable layer :/images/themes/default/mActionFormAnnotation.png:/images/themes/default/mActionFormAnnotation.png - Html Annotation + HTML Annotation - Html Annotation + HTML Annotation diff --git a/src/ui/qgscomposerbase.ui b/src/ui/qgscomposerbase.ui index b8796cc20e40..de9710565f0b 100755 --- a/src/ui/qgscomposerbase.ui +++ b/src/ui/qgscomposerbase.ui @@ -21,16 +21,7 @@ true - - 0 - - - 0 - - - 0 - - + 0 @@ -715,7 +706,7 @@ Add &HTML - Add html frame + Add HTML frame @@ -1053,8 +1044,8 @@ - +