From e4b856da1c1c340a6313e945d4b9d8cca2c6460d Mon Sep 17 00:00:00 2001 From: jef Date: Thu, 17 Jun 2010 20:43:18 +0000 Subject: [PATCH] fix #2815 - including more missing translation strings git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13744 c8812cc2-4d05-0410-92ff-de0c093fc19c --- python/core/symbology-ng-core.sip | 3 +- src/app/qgisapp.cpp | 8 ++--- src/app/qgscustomprojectiondialog.cpp | 14 ++++----- src/app/qgsrasterlayerproperties.cpp | 6 ++-- src/app/qgssinglesymboldialog.cpp | 5 ++-- src/core/CMakeLists.txt | 1 + src/core/qgsapplication.cpp | 2 +- src/core/qgsmaplayer.cpp | 2 +- src/core/qgssearchtreenode.cpp | 15 ++++------ src/core/qgsvectordataprovider.cpp | 16 +++++----- src/core/qgsvectordataprovider.h | 2 ++ src/core/qgsvectorlayer.cpp | 4 +-- .../symbology-ng/qgssymbollayerv2registry.cpp | 16 +++++----- .../symbology-ng/qgssymbollayerv2registry.h | 11 ++++--- src/gui/CMakeLists.txt | 1 + src/gui/qgscomposerview.cpp | 2 +- src/gui/qgsencodingfiledialog.cpp | 2 +- src/gui/qgstextannotationitem.cpp | 6 ++-- src/gui/symbology-ng/characterwidget.cpp | 8 ++--- .../symbology-ng/qgsbrushstylecombobox.cpp | 30 +++++++++---------- src/gui/symbology-ng/qgsbrushstylecombobox.h | 2 ++ .../qgsgraduatedsymbolrendererv2widget.cpp | 4 +-- src/gui/symbology-ng/qgspenstylecombobox.cpp | 12 ++++---- .../qgsrulebasedrendererv2widget.cpp | 6 ++-- .../qgssymbolv2propertiesdialog.cpp | 8 ++--- .../qgssymbolv2selectordialog.cpp | 4 +-- 26 files changed, 99 insertions(+), 91 deletions(-) diff --git a/python/core/symbology-ng-core.sip b/python/core/symbology-ng-core.sip index e06116ee8ed0..fde8df2c4f9b 100644 --- a/python/core/symbology-ng-core.sip +++ b/python/core/symbology-ng-core.sip @@ -774,9 +774,10 @@ class QgsSymbolLayerV2AbstractMetadata public: /** construct metadata */ - QgsSymbolLayerV2AbstractMetadata( QString name, QgsSymbolV2::SymbolType type ); + QgsSymbolLayerV2AbstractMetadata( QString name, QString visibleName, QgsSymbolV2::SymbolType type ); QString name() const; + QString visibleName() const; QgsSymbolV2::SymbolType type() const; /** create a symbol layer of this type given the map of properties. */ diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index 8c2c05848109..e013e8eae659 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -3760,7 +3760,7 @@ void QgisApp::labeling() QgsMapLayer* layer = activeLayer(); if ( layer == NULL || layer->type() != QgsMapLayer::VectorLayer ) { - QMessageBox::warning( this, "Labeling", "Please select a vector layer first." ); + QMessageBox::warning( this, tr( "Labeling" ), tr( "Please select a vector layer first." ) ); return; } QgsVectorLayer* vlayer = dynamic_cast( layer ); @@ -4190,7 +4190,7 @@ void QgisApp::mergeSelectedFeatures() const QgsFeatureIds& featureIdSet = vl->selectedFeaturesIds(); if ( featureIdSet.size() < 2 ) { - QMessageBox::information( 0, "Not enough features selected", tr( "The merge tool requires at least two selected features" ) ); + QMessageBox::information( 0, tr( "Not enough features selected" ), tr( "The merge tool requires at least two selected features" ) ); return; } @@ -4212,7 +4212,7 @@ void QgisApp::mergeSelectedFeatures() QGis::WkbType newType = unionGeom->wkbType(); if ( providerChecksTypeStrictly && unionGeom->wkbType() != vl->wkbType() ) { - QMessageBox::critical( 0, "Union operation canceled", tr( "The union operation would result in a geometry type that is not compatible with the current layer and therefore is canceled" ) ); + QMessageBox::critical( 0, tr( "Union operation canceled" ), tr( "The union operation would result in a geometry type that is not compatible with the current layer and therefore is canceled" ) ); delete unionGeom; return; } @@ -4229,7 +4229,7 @@ void QgisApp::mergeSelectedFeatures() if ( featureListAfter.size() < 2 ) { - QMessageBox::information( 0, "Not enough features selected", tr( "The merge tool requires at least two selected features" ) ); + QMessageBox::information( 0, tr( "Not enough features selected" ), tr( "The merge tool requires at least two selected features" ) ); delete unionGeom; return; } diff --git a/src/app/qgscustomprojectiondialog.cpp b/src/app/qgscustomprojectiondialog.cpp index 8fbbba9f45ed..b08f13f80e5e 100644 --- a/src/app/qgscustomprojectiondialog.cpp +++ b/src/app/qgscustomprojectiondialog.cpp @@ -344,7 +344,7 @@ void QgsCustomProjectionDialog::on_pbnFirst_clicked() //cboEllipsoid->setCurrentText(getEllipsoidName(myEllipsoidId)); leParameters->setText( QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 4 ) ) ); mCurrentRecordLong = 1; - lblRecordNo->setText( QString::number( mCurrentRecordLong ) + " of " + QString::number( mRecordCountLong ) ); + lblRecordNo->setText( tr( "%1 of %2" ).arg( mCurrentRecordLong ).arg( mRecordCountLong ) ); } } else @@ -416,7 +416,7 @@ void QgsCustomProjectionDialog::on_pbnPrevious_clicked() //cboEllipsoid->setCurrentText(getEllipsoidName(myEllipsoidId)); leParameters->setText( QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 4 ) ) ), --mCurrentRecordLong; - lblRecordNo->setText( QString::number( mCurrentRecordLong ) + " of " + QString::number( mRecordCountLong ) ); + lblRecordNo->setText( tr( "%1 of %2" ).arg( mCurrentRecordLong ).arg( mRecordCountLong ) ); } } else @@ -489,7 +489,7 @@ void QgsCustomProjectionDialog::on_pbnNext_clicked() //cboEllipsoid->setCurrentText(getEllipsoidName(myEllipsoidId)); leParameters->setText( QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 4 ) ) ); ++mCurrentRecordLong; - lblRecordNo->setText( QString::number( mCurrentRecordLong ) + " of " + QString::number( mRecordCountLong ) ); + lblRecordNo->setText( tr( "%1 of %2" ).arg( mCurrentRecordLong ).arg( mRecordCountLong ) ); } } else @@ -558,7 +558,7 @@ void QgsCustomProjectionDialog::on_pbnLast_clicked() //cboEllipsoid->setCurrentText(getEllipsoidName(myEllipsoidId)); leParameters->setText( QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 4 ) ) ); mCurrentRecordLong = mRecordCountLong; - lblRecordNo->setText( QString::number( mCurrentRecordLong ) + " of " + QString::number( mRecordCountLong ) ); + lblRecordNo->setText( tr( "%1 of %2" ).arg( mCurrentRecordLong ).arg( mRecordCountLong ) ); } } else @@ -620,7 +620,7 @@ void QgsCustomProjectionDialog::on_pbnNew_clicked() leParameters->setText( "" ); //cboProjectionFamily->setCurrentItem(0); //cboEllipsoid->setCurrentItem(0); - lblRecordNo->setText( "* of " + QString::number( mRecordCountLong ) ); + lblRecordNo->setText( tr( "* of %1" ).arg( mRecordCountLong ) ); //remember the rec we are on in case the user aborts mLastRecordLong = mCurrentRecordLong; mCurrentRecordId = ""; @@ -898,8 +898,8 @@ void QgsCustomProjectionDialog::on_pbnCalculate_clicked() int projResult = pj_transform( wgs84Proj, myProj, 1, 0, &easthing, &northing, &z ); if ( projResult != 0 ) { - projectedX->setText( "Error" ); - projectedY->setText( "Error" ); + projectedX->setText( tr( "Error" ) ); + projectedY->setText( tr( "Error" ) ); QgsDebugMsg( pj_strerrno( projResult ) ); } else diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp index 2411d0ab8f44..e8d7c82d3b20 100644 --- a/src/app/qgsrasterlayerproperties.cpp +++ b/src/app/qgsrasterlayerproperties.cpp @@ -145,9 +145,9 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer *lyr, QWidget *p //cboxClassificationMode->addItem( tr( "Quantiles" ) ); QStringList headerLabels; - headerLabels << "Value"; - headerLabels << "Color"; - headerLabels << "Label"; + headerLabels << tr( "Value" ); + headerLabels << tr( "Color" ); + headerLabels << tr( "Label" ); mColormapTreeWidget->setHeaderLabels( headerLabels ); //disable colormap tab completely until 'Colormap' is selected (and only for type GrayOrUndefined) diff --git a/src/app/qgssinglesymboldialog.cpp b/src/app/qgssinglesymboldialog.cpp index 564df2008231..086707015573 100644 --- a/src/app/qgssinglesymboldialog.cpp +++ b/src/app/qgssinglesymboldialog.cpp @@ -256,9 +256,10 @@ void QgsSingleSymbolDialog::selectFillColor() //should this method have a different name? void QgsSingleSymbolDialog::selectTextureImage() { - QString fileName = QFileDialog::getOpenFileName( this, "Open File", + QString fileName = QFileDialog::getOpenFileName( this, + tr( "Open File" ), mTexturePath, - "Images (*.png *.xpm *.jpg)" ); //should we allow other types of images? + tr( "Images (*.png *.xpm *.jpg)" ) ); //should we allow other types of images? if ( !fileName.isNull() ) { //only process the string if the user clicked OK diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index a5314eaf4c7e..39dea4bf1e2a 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -238,6 +238,7 @@ SET(QGIS_CORE_MOC_HDRS qgsvectorlayer.h qgsrasterdataprovider.h qgsnetworkaccessmanager.h + qgsvectordataprovider.h composer/qgscomposerlegend.h composer/qgscomposermap.h diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp index 67b0a352cba6..9744481a801a 100644 --- a/src/core/qgsapplication.cpp +++ b/src/core/qgsapplication.cpp @@ -91,7 +91,7 @@ bool QgsApplication::notify( QObject * receiver, QEvent * event ) } catch ( ... ) { - QMessageBox::critical( activeWindow(), tr( "Exception" ), "unknown exception" ); + QMessageBox::critical( activeWindow(), tr( "Exception" ), tr( "unknown exception" ) ); } return done; } diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp index 0c3b6507a9b9..425a8f961c30 100644 --- a/src/core/qgsmaplayer.cpp +++ b/src/core/qgsmaplayer.cpp @@ -582,7 +582,7 @@ QString QgsMapLayer::loadNamedStyle( const QString theURI, bool &theResultFlag ) QDomElement myRoot = myDocument.firstChildElement( "qgis" ); if ( myRoot.isNull() ) { - myErrorMessage = "Error: qgis element could not be found in " + theURI; + myErrorMessage = tr( "Error: qgis element could not be found in %1" ).arg( theURI ); theResultFlag = false; return myErrorMessage; } diff --git a/src/core/qgssearchtreenode.cpp b/src/core/qgssearchtreenode.cpp index c8459c01de35..34c2d1e69e59 100644 --- a/src/core/qgssearchtreenode.cpp +++ b/src/core/qgssearchtreenode.cpp @@ -289,7 +289,7 @@ bool QgsSearchTreeNode::checkAgainst( const QgsFieldMap& fields, const QgsAttrib // this error should be caught when checking syntax, but for sure... if ( mType != tOperator ) { - mError = "Expected operator, got scalar value!"; + mError = QObject::tr( "Expected operator, got scalar value!" ); return false; } @@ -352,7 +352,7 @@ bool QgsSearchTreeNode::checkAgainst( const QgsFieldMap& fields, const QgsAttrib case opGE: return ( res >= 0 ); case opLE: return ( res <= 0 ); default: - mError = "Unexpected state when evaluating operator!"; + mError = QObject::tr( "Unexpected state when evaluating operator!" ); return false; } @@ -392,8 +392,7 @@ bool QgsSearchTreeNode::checkAgainst( const QgsFieldMap& fields, const QgsAttrib } default: - mError = "Unknown operator: "; - mError += QString::number( mOp ); + mError = QObject::tr( "Unknown operator: %1" ).arg( mOp ); return false; } } @@ -414,15 +413,13 @@ bool QgsSearchTreeNode::getValue( QgsSearchTreeValue& value, QgsSearchTreeNode* // these should never happen (no need to translate) case 3: - mError = "Unknown operator: "; - mError += value.string(); + mError = QObject::tr( "Unknown operator: %1" ).arg( value.string() ); break; case 4: - mError = "Unknown token: "; - mError += value.string(); + mError = QObject::tr( "Unknown token: %1" ).arg( value.string() ); break; default: - mError = "Unknown error!"; + mError = QObject::tr( "Unknown error!" ); break; } return false; diff --git a/src/core/qgsvectordataprovider.cpp b/src/core/qgsvectordataprovider.cpp index 4dbcaf34462f..ef371ea8c1b0 100644 --- a/src/core/qgsvectordataprovider.cpp +++ b/src/core/qgsvectordataprovider.cpp @@ -163,50 +163,50 @@ QString QgsVectorDataProvider::capabilitiesString() const if ( abilities & QgsVectorDataProvider::AddFeatures ) { - abilitiesList += "Add Features"; + abilitiesList += tr( "Add Features" ); QgsDebugMsg( "Capability: Add Features" ); } if ( abilities & QgsVectorDataProvider::DeleteFeatures ) { - abilitiesList += "Delete Features"; + abilitiesList += tr( "Delete Features" ); QgsDebugMsg( "Capability: Delete Features" ); } if ( abilities & QgsVectorDataProvider::ChangeAttributeValues ) { - abilitiesList += "Change Attribute Values"; + abilitiesList += tr( "Change Attribute Values" ); QgsDebugMsg( "Capability: Change Attribute Values" ); } if ( abilities & QgsVectorDataProvider::AddAttributes ) { - abilitiesList += "Add Attributes"; + abilitiesList += tr( "Add Attributes" ); QgsDebugMsg( "Capability: Add Attributes" ); } if ( abilities & QgsVectorDataProvider::DeleteAttributes ) { - abilitiesList += "Delete Attributes"; + abilitiesList += tr( "Delete Attributes" ); QgsDebugMsg( "Capability: Delete Attributes" ); } if ( abilities & QgsVectorDataProvider::CreateSpatialIndex ) { // TODO: Tighten up this test. See QgsOgrProvider for details. - abilitiesList += "Create Spatial Index"; + abilitiesList += tr( "Create Spatial Index" ); QgsDebugMsg( "Capability: Create Spatial Index" ); } if ( abilities & QgsVectorDataProvider::SelectAtId ) { - abilitiesList += "Fast Access to Features at ID"; + abilitiesList += tr( "Fast Access to Features at ID" ); QgsDebugMsg( "Capability: Select at ID" ); } if ( abilities & QgsVectorDataProvider::ChangeGeometries ) { - abilitiesList += "Change Geometries"; + abilitiesList += tr( "Change Geometries" ); QgsDebugMsg( "Capability: Change Geometries" ); } diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h index 658a59b983d5..69ca2d812c0a 100644 --- a/src/core/qgsvectordataprovider.h +++ b/src/core/qgsvectordataprovider.h @@ -38,6 +38,8 @@ class QTextCodec; */ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider { + Q_OBJECT + public: // If you add to this, please also add to capabilitiesString() diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp index 4a5a8a64275b..56497fc913f0 100644 --- a/src/core/qgsvectorlayer.cpp +++ b/src/core/qgsvectorlayer.cpp @@ -2844,14 +2844,14 @@ bool QgsVectorLayer::writeSymbology( QDomNode& node, QDomDocument& doc, QString& { if ( !myRenderer->writeXML( node, doc, *this ) ) { - errorMessage = "renderer failed to save"; + errorMessage = tr( "renderer failed to save" ); return false; } } else { QgsDebugMsg( "no renderer" ); - errorMessage = "no renderer"; + errorMessage = tr( "no renderer" ); return false; } } diff --git a/src/core/symbology-ng/qgssymbollayerv2registry.cpp b/src/core/symbology-ng/qgssymbollayerv2registry.cpp index 3f8690c939d4..6aca1b59297a 100644 --- a/src/core/symbology-ng/qgssymbollayerv2registry.cpp +++ b/src/core/symbology-ng/qgssymbollayerv2registry.cpp @@ -10,23 +10,23 @@ QgsSymbolLayerV2Registry* QgsSymbolLayerV2Registry::mInstance = NULL; QgsSymbolLayerV2Registry::QgsSymbolLayerV2Registry() { // init registry with known symbol layers - addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SimpleLine", QgsSymbolV2::Line, + addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SimpleLine", QObject::tr( "Simple line" ), QgsSymbolV2::Line, QgsSimpleLineSymbolLayerV2::create ) ); - addSymbolLayerType( new QgsSymbolLayerV2Metadata( "MarkerLine", QgsSymbolV2::Line, + addSymbolLayerType( new QgsSymbolLayerV2Metadata( "MarkerLine", QObject::tr( "Marker line" ), QgsSymbolV2::Line, QgsMarkerLineSymbolLayerV2::create ) ); - addSymbolLayerType( new QgsSymbolLayerV2Metadata( "LineDecoration", QgsSymbolV2::Line, + addSymbolLayerType( new QgsSymbolLayerV2Metadata( "LineDecoration", QObject::tr( "Line decoration" ), QgsSymbolV2::Line, QgsLineDecorationSymbolLayerV2::create ) ); - addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SimpleMarker", QgsSymbolV2::Marker, + addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SimpleMarker", QObject::tr( "Simple marker" ), QgsSymbolV2::Marker, QgsSimpleMarkerSymbolLayerV2::create ) ); - addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SvgMarker", QgsSymbolV2::Marker, + addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SvgMarker", QObject::tr( "SVG marker" ), QgsSymbolV2::Marker, QgsSvgMarkerSymbolLayerV2::create ) ); - addSymbolLayerType( new QgsSymbolLayerV2Metadata( "FontMarker", QgsSymbolV2::Marker, + addSymbolLayerType( new QgsSymbolLayerV2Metadata( "FontMarker", QObject::tr( "Font marker" ), QgsSymbolV2::Marker, QgsFontMarkerSymbolLayerV2::create ) ); - addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SimpleFill", QgsSymbolV2::Fill, + addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SimpleFill", QObject::tr( "Simple fill" ), QgsSymbolV2::Fill, QgsSimpleFillSymbolLayerV2::create ) ); - addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SVGFill", QgsSymbolV2::Fill, QgsSVGFillSymbolLayer::create ) ); + addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SVGFill", QObject::tr( "SVG fill" ), QgsSymbolV2::Fill, QgsSVGFillSymbolLayer::create ) ); } QgsSymbolLayerV2Registry::~QgsSymbolLayerV2Registry() diff --git a/src/core/symbology-ng/qgssymbollayerv2registry.h b/src/core/symbology-ng/qgssymbollayerv2registry.h index 1f792a557a9e..70e377241a5f 100644 --- a/src/core/symbology-ng/qgssymbollayerv2registry.h +++ b/src/core/symbology-ng/qgssymbollayerv2registry.h @@ -14,10 +14,11 @@ class CORE_EXPORT QgsSymbolLayerV2AbstractMetadata { public: - QgsSymbolLayerV2AbstractMetadata( QString name, QgsSymbolV2::SymbolType type ) - : mName( name ), mType( type ) {} + QgsSymbolLayerV2AbstractMetadata( QString name, QString visibleName, QgsSymbolV2::SymbolType type ) + : mName( name ), mVisibleName( visibleName ), mType( type ) {} QString name() const { return mName; } + QString visibleName() const { return mVisibleName; } QgsSymbolV2::SymbolType type() const { return mType; } /** create a symbol layer of this type given the map of properties. */ @@ -27,6 +28,7 @@ class CORE_EXPORT QgsSymbolLayerV2AbstractMetadata protected: QString mName; + QString mVisibleName; QgsSymbolV2::SymbolType mType; }; @@ -39,10 +41,11 @@ typedef QgsSymbolLayerV2Widget*( *QgsSymbolLayerV2WidgetFunc )(); class CORE_EXPORT QgsSymbolLayerV2Metadata : public QgsSymbolLayerV2AbstractMetadata { public: - QgsSymbolLayerV2Metadata( QString name, QgsSymbolV2::SymbolType type, + QgsSymbolLayerV2Metadata( QString name, QString visibleName, + QgsSymbolV2::SymbolType type, QgsSymbolLayerV2CreateFunc pfCreate, QgsSymbolLayerV2WidgetFunc pfWidget = NULL ) - : QgsSymbolLayerV2AbstractMetadata( name, type ), mCreateFunc( pfCreate ), mWidgetFunc( pfWidget ) {} + : QgsSymbolLayerV2AbstractMetadata( name, visibleName, type ), mCreateFunc( pfCreate ), mWidgetFunc( pfWidget ) {} QgsSymbolLayerV2CreateFunc createFunction() const { return mCreateFunc; } QgsSymbolLayerV2WidgetFunc widgetFunction() const { return mWidgetFunc; } diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index a41746880145..8f5f34e73cf2 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -74,6 +74,7 @@ symbology-ng/qgsvectorrandomcolorrampv2dialog.h symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.h symbology-ng/characterwidget.h symbology-ng/qgspenstylecombobox.h +symbology-ng/qgsbrushstylecombobox.h qgsattributeeditor.h qgscomposerview.h diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp index 69e3cd3857cb..eb46364b4c4f 100644 --- a/src/gui/qgscomposerview.cpp +++ b/src/gui/qgscomposerview.cpp @@ -127,7 +127,7 @@ void QgsComposerView::mousePressEvent( QMouseEvent* e ) case AddLabel: { QgsComposerLabel* newLabelItem = new QgsComposerLabel( composition() ); - newLabelItem->setText( "Quantum GIS" ); + newLabelItem->setText( tr( "Quantum GIS" ) ); newLabelItem->adjustSizeToText(); newLabelItem->setSceneRect( QRectF( snappedScenePoint.x(), snappedScenePoint.y(), newLabelItem->rect().width(), newLabelItem->rect().height() ) ); addComposerLabel( newLabelItem ); diff --git a/src/gui/qgsencodingfiledialog.cpp b/src/gui/qgsencodingfiledialog.cpp index 0e2e27d800cf..9e69ed137c84 100644 --- a/src/gui/qgsencodingfiledialog.cpp +++ b/src/gui/qgsencodingfiledialog.cpp @@ -90,7 +90,7 @@ void QgsEncodingFileDialog::addCancelAll() { if ( ! mCancelAllButton ) { - mCancelAllButton = new QPushButton( "Cancel &All", NULL ); + mCancelAllButton = new QPushButton( tr( "Cancel &All" ), NULL ); layout()->addWidget( mCancelAllButton ); // Ownership transfered, no need to delete later on connect( mCancelAllButton, SIGNAL( clicked() ), this, SLOT( pbnCancelAll_clicked() ) ); } diff --git a/src/gui/qgstextannotationitem.cpp b/src/gui/qgstextannotationitem.cpp index 6dcd448fbc0e..b362cd1ae107 100644 --- a/src/gui/qgstextannotationitem.cpp +++ b/src/gui/qgstextannotationitem.cpp @@ -61,8 +61,8 @@ void QgsTextAnnotationItem::paint( QPainter * painter ) mDocument->setTextWidth( mFrameSize.width() ); painter->save(); - painter->translate( mOffsetFromReferencePoint.x() + frameWidth / 2.0, mOffsetFromReferencePoint.y() + \ - frameWidth / 2.0 ); + painter->translate( mOffsetFromReferencePoint.x() + frameWidth / 2.0, + mOffsetFromReferencePoint.y() + frameWidth / 2.0 ); //draw text document mDocument->drawContents( painter, QRectF( 0, 0, mFrameSize.width() - frameWidth / 2.0, mFrameSize.height() - frameWidth / 2.0 ) ); @@ -93,7 +93,7 @@ void QgsTextAnnotationItem::readXML( const QDomDocument& doc, const QDomElement& { delete mDocument; mDocument = new QTextDocument; - mDocument->setHtml( itemElem.attribute( "document", "QGIS rocks!" ) ); + mDocument->setHtml( itemElem.attribute( "document", QObject::tr( "QGIS rocks!" ) ) ); QDomElement annotationElem = itemElem.firstChildElement( "AnnotationItem" ); if ( !annotationElem.isNull() ) { diff --git a/src/gui/symbology-ng/characterwidget.cpp b/src/gui/symbology-ng/characterwidget.cpp index 6b6ae7b14f75..3fcc7794248a 100644 --- a/src/gui/symbology-ng/characterwidget.cpp +++ b/src/gui/symbology-ng/characterwidget.cpp @@ -108,10 +108,10 @@ void CharacterWidget::mouseMoveEvent( QMouseEvent *event ) QPoint widgetPosition = mapFromGlobal( event->globalPos() ); uint key = ( widgetPosition.y() / squareSize ) * columns + widgetPosition.x() / squareSize; - QString text = QString::fromLatin1( "

Character: " ).arg( displayFont.family() ) - + QChar( key ) - + QString::fromLatin1( "

Value: 0x" ) - + QString::number( key, 16 ); + QString text = tr( "

Character:

Value: 0x%3\">" ) + .arg( displayFont.family() ) + .arg( QChar( key ) ) + .arg( key, 16 ); QToolTip::showText( event->globalPos(), text, this ); } //! [4] diff --git a/src/gui/symbology-ng/qgsbrushstylecombobox.cpp b/src/gui/symbology-ng/qgsbrushstylecombobox.cpp index a5534fc4f71d..793c4e691941 100644 --- a/src/gui/symbology-ng/qgsbrushstylecombobox.cpp +++ b/src/gui/symbology-ng/qgsbrushstylecombobox.cpp @@ -12,21 +12,21 @@ QgsBrushStyleComboBox::QgsBrushStyleComboBox( QWidget* parent ) : QComboBox( parent ) { QList < QPair > styles; - styles << qMakePair( Qt::SolidPattern, QString( "Solid" ) ) - << qMakePair( Qt::HorPattern, QString( "Horizontal" ) ) - << qMakePair( Qt::VerPattern, QString( "Vertical" ) ) - << qMakePair( Qt::CrossPattern, QString( "Cross" ) ) - << qMakePair( Qt::BDiagPattern, QString( "BDiagonal" ) ) - << qMakePair( Qt::FDiagPattern, QString( "FDiagonal" ) ) - << qMakePair( Qt::DiagCrossPattern, QString( "Diagonal X" ) ) - << qMakePair( Qt::Dense1Pattern, QString( "Dense 1" ) ) - << qMakePair( Qt::Dense2Pattern, QString( "Dense 2" ) ) - << qMakePair( Qt::Dense3Pattern, QString( "Dense 3" ) ) - << qMakePair( Qt::Dense4Pattern, QString( "Dense 4" ) ) - << qMakePair( Qt::Dense5Pattern, QString( "Dense 5" ) ) - << qMakePair( Qt::Dense6Pattern, QString( "Dense 6" ) ) - << qMakePair( Qt::Dense7Pattern, QString( "Dense 7" ) ) - << qMakePair( Qt::NoBrush, QString( "No Brush" ) ); + styles << qMakePair( Qt::SolidPattern, tr( "Solid" ) ) + << qMakePair( Qt::HorPattern, tr( "Horizontal" ) ) + << qMakePair( Qt::VerPattern, tr( "Vertical" ) ) + << qMakePair( Qt::CrossPattern, tr( "Cross" ) ) + << qMakePair( Qt::BDiagPattern, tr( "BDiagonal" ) ) + << qMakePair( Qt::FDiagPattern, tr( "FDiagonal" ) ) + << qMakePair( Qt::DiagCrossPattern, tr( "Diagonal X" ) ) + << qMakePair( Qt::Dense1Pattern, tr( "Dense 1" ) ) + << qMakePair( Qt::Dense2Pattern, tr( "Dense 2" ) ) + << qMakePair( Qt::Dense3Pattern, tr( "Dense 3" ) ) + << qMakePair( Qt::Dense4Pattern, tr( "Dense 4" ) ) + << qMakePair( Qt::Dense5Pattern, tr( "Dense 5" ) ) + << qMakePair( Qt::Dense6Pattern, tr( "Dense 6" ) ) + << qMakePair( Qt::Dense7Pattern, tr( "Dense 7" ) ) + << qMakePair( Qt::NoBrush, tr( "No Brush" ) ); setIconSize( QSize( 32, 16 ) ); diff --git a/src/gui/symbology-ng/qgsbrushstylecombobox.h b/src/gui/symbology-ng/qgsbrushstylecombobox.h index 4e1f2b16c2f9..08f57837d2e6 100644 --- a/src/gui/symbology-ng/qgsbrushstylecombobox.h +++ b/src/gui/symbology-ng/qgsbrushstylecombobox.h @@ -6,6 +6,8 @@ class GUI_EXPORT QgsBrushStyleComboBox : public QComboBox { + Q_OBJECT + public: QgsBrushStyleComboBox( QWidget* parent = NULL ); diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp index 50e5c4afff5c..832452b85a1d 100644 --- a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp +++ b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp @@ -48,7 +48,7 @@ QgsGraduatedSymbolRendererV2Widget::QgsGraduatedSymbolRendererV2Widget( QgsVecto populateColorRamps(); QStandardItemModel* mg = new QStandardItemModel( this ); QStringList labels; - labels << "Range" << "Label"; + labels << tr( "Range" ) << tr( "Label" ); mg->setHorizontalHeaderLabels( labels ); viewGraduated->setModel( mg ); @@ -218,7 +218,7 @@ void QgsGraduatedSymbolRendererV2Widget::populateRanges() mRowSelected = -1; QStringList labels; - labels << "Symbol" << "Range" << "Label"; + labels << tr( "Symbol" ) << tr( "Range" ) << tr( "Label" ); m->setHorizontalHeaderLabels( labels ); QSize iconSize( 16, 16 ); diff --git a/src/gui/symbology-ng/qgspenstylecombobox.cpp b/src/gui/symbology-ng/qgspenstylecombobox.cpp index 75d87c6b82f1..0f804d17f7c6 100644 --- a/src/gui/symbology-ng/qgspenstylecombobox.cpp +++ b/src/gui/symbology-ng/qgspenstylecombobox.cpp @@ -13,12 +13,12 @@ QgsPenStyleComboBox::QgsPenStyleComboBox( QWidget* parent ) : QComboBox( parent ) { QList < QPair > styles; - styles << qMakePair( Qt::SolidLine, QString( "Solid Line" ) ) - << qMakePair( Qt::DashLine, QString( "Dash Line" ) ) - << qMakePair( Qt::DotLine, QString( "Dot Line" ) ) - << qMakePair( Qt::DashDotLine, QString( "Dash Dot Line" ) ) - << qMakePair( Qt::DashDotDotLine, QString( "Dash Dot Dot Line" ) ) - << qMakePair( Qt::NoPen, QString( "No Pen" ) ); + styles << qMakePair( Qt::SolidLine, tr( "Solid Line" ) ) + << qMakePair( Qt::DashLine, tr( "Dash Line" ) ) + << qMakePair( Qt::DotLine, tr( "Dot Line" ) ) + << qMakePair( Qt::DashDotLine, tr( "Dash Dot Line" ) ) + << qMakePair( Qt::DashDotDotLine, tr( "Dash Dot Dot Line" ) ) + << qMakePair( Qt::NoPen, tr( "No Pen" ) ); setIconSize( QSize( 32, 12 ) ); diff --git a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp b/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp index 5e77cfb2cebd..b0dface5b581 100644 --- a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp +++ b/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp @@ -421,7 +421,7 @@ void QgsRendererRulesTreeWidget::populateRulesNoGrouping() if ( txt.isEmpty() ) txt = tr( "(no filter)" ); if ( rule.dependsOnScale() ) { - txt += QString( ", scale " ) + formatScaleRange( rule.scaleMinDenom(), rule.scaleMaxDenom() ); + txt += tr( ", scale " ) + formatScaleRange( rule.scaleMinDenom(), rule.scaleMaxDenom() ); } item->setText( 0, txt ); @@ -447,9 +447,9 @@ void QgsRendererRulesTreeWidget::populateRulesGroupByScale() { QString txt; if ( rule.dependsOnScale() ) - txt = QString( "scale " ) + formatScaleRange( rule.scaleMinDenom(), rule.scaleMaxDenom() ); + txt = tr( "scale " ) + formatScaleRange( rule.scaleMinDenom(), rule.scaleMaxDenom() ); else - txt = "any scale"; + txt = tr( "any scale" ); QTreeWidgetItem* scale_item = new QTreeWidgetItem; scale_item->setText( 0, txt ); diff --git a/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp b/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp index 654385ae698c..de4bd753c9d7 100644 --- a/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp +++ b/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp @@ -43,7 +43,7 @@ class SymbolLayerItem : public QStandardItem QVariant data( int role ) const { if ( role == Qt::DisplayRole ) - return QVariant( mLayer->layerType() ); + return QgsSymbolLayerV2Registry::instance()->symbolLayerMetadata( mLayer->layerType() )->visibleName(); if ( role == Qt::SizeHintRole ) return QVariant( QSize( 32, 32 ) ); if ( role == Qt::CheckStateRole ) @@ -162,7 +162,7 @@ void QgsSymbolV2PropertiesDialog::populateLayerTypes() cboLayerType->clear(); for ( int i = 0; i < types.count(); i++ ) - cboLayerType->addItem( types[i] ); + cboLayerType->addItem( QgsSymbolLayerV2Registry::instance()->symbolLayerMetadata( types[i] )->visibleName(), types[i] ); } @@ -285,7 +285,7 @@ void QgsSymbolV2PropertiesDialog::layerChanged() return; // update layer type combo box - int idx = cboLayerType->findText( layer->layerType() ); + int idx = cboLayerType->findData( layer->layerType() ); cboLayerType->setCurrentIndex( idx ); updateSymbolLayerWidget( layer ); @@ -308,7 +308,7 @@ void QgsSymbolV2PropertiesDialog::layerTypeChanged() QgsSymbolLayerV2* layer = currentLayer(); if ( layer == NULL ) return; - QString newLayerType = cboLayerType->currentText(); + QString newLayerType = cboLayerType->itemData( cboLayerType->currentIndex() ).toString(); if ( layer->layerType() == newLayerType ) return; diff --git a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp index d0bb700eea90..682ec1433630 100644 --- a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp +++ b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp @@ -210,8 +210,8 @@ void QgsSymbolV2SelectorDialog::setLineWidth( double width ) void QgsSymbolV2SelectorDialog::addSymbolToStyle() { bool ok; - QString name = QInputDialog::getText( this, "Symbol name", - "Please enter name for the symbol:", QLineEdit::Normal, "New symbol", &ok ); + QString name = QInputDialog::getText( this, tr( "Symbol name" ), + tr( "Please enter name for the symbol:" ) , QLineEdit::Normal, tr( "New symbol" ), &ok ); if ( !ok || name.isEmpty() ) return;