Skip to content

Commit 4b7612c

Browse files
author
g_j_m
committed
- misc. Qt3 to Qt4 changes
- add tr() to user visible text - make the image chooser show all the valid file formats in the filter git-svn-id: http://svn.osgeo.org/qgis/trunk@5322 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 38806c4 commit 4b7612c

File tree

7 files changed

+40
-41
lines changed

7 files changed

+40
-41
lines changed

‎src/composer/qgscomposer.cpp‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -365,29 +365,29 @@ void QgsComposer::on_mActionPrint_activated(void)
365365
s.sprintf( "%%%%BoundingBox: 0 0 %d %d", w, h );
366366

367367
if ( s.length() > size ) {
368-
QMessageBox::warning(this,"Error in Print", "Cannot format BoundingBox");
368+
QMessageBox::warning(this, tr("Error in Print"), tr("Cannot format BoundingBox"));
369369
} else {
370370
if ( ! f.at(offset) ) {
371-
QMessageBox::warning(this,"Error in Print", "Cannot seek");
371+
QMessageBox::warning(this, tr("Error in Print"), tr("Cannot seek"));
372372
} else {
373373
/* Write spaces (for case the size > s.length() ) */
374374
QString es;
375375
es.fill(' ', size-1 );
376376
f.flush();
377377
if ( f.writeBlock ( es.toLocal8Bit().data(), size-1 ) < size-1 ) {
378-
QMessageBox::warning(this,"Error in Print", "Cannot overwrite BoundingBox");
378+
QMessageBox::warning(this, tr("Error in Print"), tr("Cannot overwrite BoundingBox"));
379379
}
380380
f.flush();
381381
f.at(offset);
382382
f.flush();
383383
if ( f.writeBlock ( s.toLocal8Bit().data(), s.length() ) < s.length()-1 ) {
384-
QMessageBox::warning(this,"Error in Print", "Cannot overwrite BoundingBox");
384+
QMessageBox::warning(this, tr("Error in Print"), tr("Cannot overwrite BoundingBox"));
385385
}
386386
f.flush();
387387
}
388388
}
389389
} else {
390-
QMessageBox::warning(this,"Error in Print", "Cannot find BoundingBox");
390+
QMessageBox::warning(this, tr("Error in Print"), tr("Cannot find BoundingBox"));
391391
}
392392
f.close();
393393

@@ -420,35 +420,35 @@ void QgsComposer::on_mActionPrint_activated(void)
420420
s.sprintf( "0 %d translate %s scale/defM matrix CM d } d", trans, (const char *)rx.cap(1).toLocal8Bit().data() );
421421

422422
if ( s.length() > size ) {
423-
QMessageBox::warning(this,"Error in Print", "Cannot format translate");
423+
QMessageBox::warning(this, tr("Error in Print"), tr("Cannot format translate"));
424424
} else {
425425
if ( ! f.at(offset) ) {
426-
QMessageBox::warning(this,"Error in Print", "Cannot seek");
426+
QMessageBox::warning(this, tr("Error in Print"), tr("Cannot seek"));
427427
} else {
428428
/* Write spaces (for case the size > s.length() ) */
429429
QString es;
430430
es.fill(' ', size-1 );
431431
f.flush();
432432
if ( f.writeBlock ( es.toLocal8Bit().data(), size-1 ) < size-1 ) {
433-
QMessageBox::warning(this,"Error in Print", "Cannot overwrite translate");
433+
QMessageBox::warning(this, tr("Error in Print"), tr("Cannot overwrite translate"));
434434
}
435435
f.flush();
436436
f.at(offset);
437437
f.flush();
438438
if ( f.writeBlock ( s.toLocal8Bit().data(), s.length() ) < s.length()-1 ) {
439-
QMessageBox::warning(this,"Error in Print", "Cannot overwrite translate");
439+
QMessageBox::warning(this, tr("Error in Print"), tr("Cannot overwrite translate"));
440440
}
441441
f.flush();
442442
}
443443
}
444444
} else {
445-
QMessageBox::warning(this,"Error in Print", "Cannot find translate");
445+
QMessageBox::warning(this, tr("Error in Print"), tr("Cannot find translate"));
446446
}
447447
f.close();
448448
}
449449
#endif
450450
} catch (QgsIOException e) {
451-
QMessageBox::warning(this,"File IO Error", e.what());
451+
QMessageBox::warning(this, tr("File IO Error"), e.what());
452452
}
453453
} else { // print to printer
454454
bool print = true;
@@ -458,8 +458,8 @@ void QgsComposer::on_mActionPrint_activated(void)
458458
if ( mComposition->paperWidth() != mPrinter->widthMM() ||
459459
mComposition->paperHeight() != mPrinter->heightMM() )
460460
{
461-
int answer = QMessageBox::warning ( 0, "Paper does not match",
462-
"The selected paper size does not match the composition size",
461+
int answer = QMessageBox::warning ( 0, tr("Paper does not match"),
462+
tr("The selected paper size does not match the composition size"),
463463
QMessageBox::Ok, QMessageBox::Abort );
464464

465465
if ( answer == QMessageBox::Abort )
@@ -502,11 +502,11 @@ void QgsComposer::on_mActionExportAsImage_activated(void)
502502
#endif
503503

504504
if ( memuse > 200 ) { // cca 4500 x 4500
505-
int answer = QMessageBox::warning ( 0, "Big image",
506-
"To create image " + QString::number(width) + " x "
505+
int answer = QMessageBox::warning ( 0, tr("Big image"),
506+
tr("To create image ") + QString::number(width) + " x "
507507
+ QString::number(height)
508-
+ " requires circa "
509-
+ QString::number(memuse) + " MB of memory",
508+
+ tr(" requires circa ")
509+
+ QString::number(memuse) + tr(" MB of memory"),
510510
QMessageBox::Ok, QMessageBox::Abort );
511511

512512
raise ();
@@ -616,13 +616,12 @@ void QgsComposer::on_mActionExportAsSVG_activated(void)
616616
QSettings myQSettings;
617617
QString myLastUsedFile = myQSettings.readEntry("/UI/lastSaveAsSvgFile","qgis.svg");
618618

619-
QFileDialog *myQFileDialog = new QFileDialog( this, "Save svg file dialog",
620-
"", "SVG Format (*.svg *SVG)" );
619+
QFileDialog *myQFileDialog = new QFileDialog( this, tr("Choose a filename to save the map as"),
620+
".", "SVG Format (*.svg *SVG)" );
621621

622-
myQFileDialog->setCaption(tr("Choose a filename to save the map as"));
623-
624622
myQFileDialog->selectFile( myLastUsedFile );
625623
myQFileDialog->setMode(QFileDialog::AnyFile);
624+
myQFileDialog->setAcceptMode(QFileDialog::AcceptSave);
626625

627626
int result = myQFileDialog->exec();
628627
raise ();

‎src/composer/qgscomposeritem.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* (at your option) any later version. *
1515
* *
1616
***************************************************************************/
17-
#include <qwidget.h>
18-
#include <qdom.h>
17+
#include <QWidget>
18+
#include <QDomNode>
1919

2020
#include "qgscomposition.h"
2121
#include "qgscomposeritem.h"

‎src/composer/qgscomposermap.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ void QgsComposerMap::init ()
8080

8181
// Preview style
8282
mPreviewMode = Cache;
83-
mPreviewModeComboBox->insertItem ( "Cache", Cache );
84-
mPreviewModeComboBox->insertItem ( "Render", Render );
85-
mPreviewModeComboBox->insertItem ( "Rectangle", Rectangle );
83+
mPreviewModeComboBox->insertItem ( tr("Cache"), Cache );
84+
mPreviewModeComboBox->insertItem ( tr("Render"), Render );
85+
mPreviewModeComboBox->insertItem ( tr("Rectangle"), Rectangle );
8686
mPreviewModeComboBox->setCurrentItem ( Cache );
8787

8888
mWidthScale = 1.0 / mComposition->scale();

‎src/composer/qgscomposerpicture.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <QFileDialog>
2323
#include <QMessageBox>
2424
#include <QPainter>
25-
#include <Q3StrList>
25+
#include <QImageWriter>
2626

2727
#include <cmath>
2828
#include <iostream>
@@ -411,8 +411,8 @@ void QgsComposerPicture::pictureChanged ( )
411411
loadPicture();
412412

413413
if ( !mPictureValid ) {
414-
QMessageBox::warning( 0, "Warning",
415-
"Cannot load picture." );
414+
QMessageBox::warning( 0, tr("Warning"),
415+
tr("Cannot load picture.") );
416416
}
417417
else
418418
{
@@ -479,19 +479,19 @@ QWidget *QgsComposerPicture::options ( void )
479479
QString QgsComposerPicture::pictureDialog ( void )
480480
{
481481
QString filters = "Pictures ( *.svg *.SVG ";
482-
Q3StrList formats = QPictureIO::outputFormats();
482+
QList<QByteArray> formats = QImageWriter::supportedImageFormats();
483483

484484
for ( int i = 0; i < formats.count(); i++ )
485485
{
486-
QString frmt = QPictureIO::outputFormats().at( i );
486+
QString frmt = formats.at( i );
487487
QString fltr = " *." + frmt.lower() + " *." + frmt.upper();
488488
filters += fltr;
489489
}
490490
filters += " )";
491491

492492
QString file = QFileDialog::getOpenFileName(
493493
0,
494-
"Choose a file",
494+
tr("Choose a file"),
495495
".",
496496
filters );
497497

‎src/composer/qgscomposervectorlegend.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ void QgsComposerVectorLegend::init ( void )
114114

115115
mLayersPopupMenu = new Q3PopupMenu( );
116116

117-
mLayersPopupMenu->insertItem( "Combine selected layers", this, SLOT(groupLayers()) );
117+
mLayersPopupMenu->insertItem( tr("Combine selected layers"), this, SLOT(groupLayers()) );
118118

119119
connect ( mLayersListView, SIGNAL(clicked(Q3ListViewItem *)),
120120
this, SLOT(layerChanged(Q3ListViewItem *)));
@@ -127,9 +127,9 @@ void QgsComposerVectorLegend::init ( void )
127127

128128
// Preview style
129129
mPreviewMode = Render;
130-
mPreviewModeComboBox->insertItem ( "Cache", Cache );
131-
mPreviewModeComboBox->insertItem ( "Render", Render );
132-
mPreviewModeComboBox->insertItem ( "Rectangle", Rectangle );
130+
mPreviewModeComboBox->insertItem ( tr("Cache"), Cache );
131+
mPreviewModeComboBox->insertItem ( tr("Render"), Render );
132+
mPreviewModeComboBox->insertItem ( tr("Rectangle"), Rectangle );
133133
mPreviewModeComboBox->setCurrentItem ( mPreviewMode );
134134

135135
connect ( mComposition, SIGNAL(mapChanged(int)), this, SLOT(mapChanged(int)) );

‎src/composer/qgscomposerview.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
***************************************************************************/
1717
#include <iostream>
1818

19-
#include <qmatrix.h>
20-
#include <qevent.h>
19+
#include <QMatrix>
20+
#include <QEvent>
2121

2222
#include "qgsrect.h"
2323

‎src/composer/qgscomposition.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ void QgsComposition::setTool ( Tool tool )
714714

715715
// Create new object outside the visible area
716716
QgsComposerLabel *lab = new QgsComposerLabel ( this, mNextItemId++,
717-
(-1000)*mScale, (-1000)*mScale, "Label", (int) (mScale*mPaperHeight/40) );
717+
(-1000)*mScale, (-1000)*mScale, tr("Label"), (int) (mScale*mPaperHeight/40) );
718718
mNewCanvasItem = dynamic_cast <Q3CanvasItem *> (lab);
719719
mComposer->showItemOptions ( lab->options() );
720720

@@ -759,8 +759,8 @@ void QgsComposition::setTool ( Tool tool )
759759
}
760760
else
761761
{
762-
QMessageBox::warning( 0, "Warning",
763-
"Cannot load picture." );
762+
QMessageBox::warning( 0, tr("Warning"),
763+
tr("Cannot load picture.") );
764764

765765
delete pi;
766766
}

0 commit comments

Comments
 (0)