Skip to content
Permalink
Browse files

Standardise capitalisation of HTML string (refs #7050)

  • Loading branch information
nyalldawson committed Jul 13, 2015
1 parent b4c6023 commit 36992b3ba66a764fa6dd2ea15194262b06310ed8
@@ -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();
@@ -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 <a href=\"http://docs.qgis.org/latest/en/docs/user_manual/working_with_vector/vector_properties.html?#actions-menu\">documentation</a>."
) );
addGuiTip( myTip );
@@ -454,7 +454,7 @@ void QgsComposerHtml::setUserStylesheetEnabled( const bool stylesheetEnabled )

QString QgsComposerHtml::displayName() const
{
return tr( "<html frame>" );
return tr( "<HTML frame>" );
}

bool QgsComposerHtml::writeXML( QDomElement& elem, QDomDocument & doc, bool ignoreFrames ) const
@@ -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();

@@ -525,7 +525,7 @@ bool QgsMapToolIdentify::identifyRasterLayer( QList<IdentifyResult> *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();
@@ -17,7 +17,7 @@
<x>0</x>
<y>0</y>
<width>1050</width>
<height>27</height>
<height>25</height>
</rect>
</property>
<widget class="QMenu" name="mProjectMenu">
@@ -1908,10 +1908,10 @@ Acts on currently active editable layer</string>
<normaloff>:/images/themes/default/mActionFormAnnotation.png</normaloff>:/images/themes/default/mActionFormAnnotation.png</iconset>
</property>
<property name="text">
<string>Html Annotation</string>
<string>HTML Annotation</string>
</property>
<property name="toolTip">
<string>Html Annotation</string>
<string>HTML Annotation</string>
</property>
</action>
<action name="mActionDuplicateLayer">
@@ -21,16 +21,7 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
@@ -715,7 +706,7 @@
<string>Add &amp;HTML</string>
</property>
<property name="toolTip">
<string>Add html frame</string>
<string>Add HTML frame</string>
</property>
</action>
<action name="mActionComposerManager">
@@ -1053,8 +1044,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 36992b3

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