Standardise capitalisation of HTML string (refs #7050)

nyalldawson · nyalldawson · commit 36992b3ba66a · 2015-07-13T16:07:02.000+10:00
diff --git 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
@@ -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 );
diff --git 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( "<html frame>" );
+  return tr( "<HTML frame>" );
 }
 
 bool QgsComposerHtml::writeXML( QDomElement& elem, QDomDocument & doc, bool ignoreFrames ) const
diff --git 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
@@ -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();
diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -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">
diff --git a/src/ui/qgscomposerbase.ui b/src/ui/qgscomposerbase.ui
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ void QgsComposerHtmlWidget::on_mUrlLineEdit_editingFinished()`
`122`	`122`	`QgsComposition* composition = mHtml->composition();`
`123`	`123`	`if ( composition )`
`124`	`124`	`{`
`125`		`- composition->beginMultiFrameCommand( mHtml, tr( "Change html url" ) );`
	`125`	`+ composition->beginMultiFrameCommand( mHtml, tr( "Change HTML url" ) );`
`126`	`126`	`mHtml->setUrl( newUrl );`
`127`	`127`	`mHtml->update();`
`128`	`128`	`composition->endMultiFrameCommand();`
Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ void QgsComposerHtml::setUserStylesheetEnabled( const bool stylesheetEnabled )`
`454`	`454`
`455`	`455`	`QString QgsComposerHtml::displayName() const`
`456`	`456`	`{`
`457`		`- return tr( "<html frame>" );`
	`457`	`+ return tr( "<HTML frame>" );`
`458`	`458`	`}`
`459`	`459`
`460`	`460`	`bool QgsComposerHtml::writeXML( QDomElement& elem, QDomDocument & doc, bool ignoreFrames ) const`
Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,7 @@ bool QgsMapToolIdentify::identifyRasterLayer( QList<IdentifyResult> *results, Qg`
`525`	`525`	`}`
`526`	`526`	`else // text or html`
`527`	`527`	`{`
`528`		`- QgsDebugMsg( QString( "%1 html or text values" ).arg( values.size() ) );`
	`528`	`+ QgsDebugMsg( QString( "%1 HTML or text values" ).arg( values.size() ) );`
`529`	`529`	`foreach ( int bandNo, values.keys() )`
`530`	`530`	`{`
`531`	`531`	`QString value = values.value( bandNo ).toString();`