[QGIS Commit] r10235 - branches/Version-1_0/src/app/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-02-25 13:41:20 -0500 (Wed, 25 Feb 2009)
New Revision: 10235

Modified:
   branches/Version-1_0/src/app/composer/qgscomposerscalebarwidget.cpp
Log:
Fix for scalebarproblem (bug 1479) also in 1.0

Modified: branches/Version-1_0/src/app/composer/qgscomposerscalebarwidget.cpp
===================================================================
--- branches/Version-1_0/src/app/composer/qgscomposerscalebarwidget.cpp	2009-02-25 14:57:47 UTC (rev 10234)
+++ branches/Version-1_0/src/app/composer/qgscomposerscalebarwidget.cpp	2009-02-25 18:41:20 UTC (rev 10235)
@@ -64,7 +64,7 @@
       QList<const QgsComposerMap*>::const_iterator mapItemIt = availableMaps.constBegin();
       for ( ; mapItemIt != availableMaps.constEnd(); ++mapItemIt )
       {
-        mMapComboBox->addItem( tr( "Map " ) + QString::number(( *mapItemIt )->id() ) );
+        mMapComboBox->addItem( tr( "Map %1" ).arg(( *mapItemIt )->id() ) );
       }
     }
   }
@@ -145,7 +145,7 @@
   //map combo box
   if ( mComposerScaleBar->composerMap() )
   {
-    QString mapText = tr( "Map " ) + mComposerScaleBar->composerMap()->id();
+    QString mapText = tr( "Map %1" ).arg( mComposerScaleBar->composerMap()->id() );
     int itemId = mMapComboBox->findText( mapText );
     if ( itemId > 0 )
     {