Skip to content

Commit 776c22f

Browse files
SrNetoChanSrNetoChan
committedJan 14, 2017
replace PNG files by SVG
mIconProjectionDisabled.svg mIconProjectionEnabled.svg transformed.svg copyright_label.svg
·
ltr-3_40final-3_0_0
1 parent 49b6c5f commit 776c22f

18 files changed

+831
-337
lines changed
 

‎images/images.qrc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,8 @@
8585
<file>themes/default/console/iconSearchPrevEditorConsole.png</file>
8686
<file>themes/default/console/iconSyntaxErrorConsole.png</file>
8787
<file>themes/default/console/iconResetColorConsole.png</file>
88-
<file>themes/default/copyright_label.png</file>
88+
<file>themes/default/copyright_label.svg</file>
8989
<file>themes/default/extents.svg</file>
90-
<file>themes/default/geographic.png</file>
9190
<file>themes/default/gpsicons/barchart.svg</file>
9291
<file>themes/default/gpsicons/polarchart.svg</file>
9392
<file>themes/default/grass_location.png</file>
@@ -370,8 +369,8 @@
370369
<file>themes/default/mIconPointLayer.svg</file>
371370
<file>themes/default/mIconPolygonLayer.svg</file>
372371
<file>themes/default/mIconPostgis.svg</file>
373-
<file>themes/default/mIconProjectionDisabled.png</file>
374-
<file>themes/default/mIconProjectionEnabled.png</file>
372+
<file>themes/default/mIconProjectionDisabled.svg</file>
373+
<file>themes/default/mIconProjectionEnabled.svg</file>
375374
<file>themes/default/mIconProperties.svg</file>
376375
<file>themes/default/mIconPyramid.png</file>
377376
<file>themes/default/mIconRaster.svg</file>
@@ -453,7 +452,6 @@
453452
<file>themes/default/repositoryConnected.png</file>
454453
<file>themes/default/repositoryDisabled.png</file>
455454
<file>themes/default/repositoryUnavailable.png</file>
456-
<file>themes/default/scale_bar.png</file>
457455
<file>themes/default/stars_empty.png</file>
458456
<file>themes/default/stars_full.png</file>
459457
<file>themes/default/styleicons/color.svg</file>

‎images/themes/default/copyright_label.png

-1.18 KB
Binary file not shown.

‎images/themes/default/copyright_label.svg

Lines changed: 1 addition & 0 deletions
Loading

‎images/themes/default/geographic.png

-3.54 KB
Binary file not shown.

‎images/themes/default/mIconProjectionDisabled.png

-1.05 KB
Binary file not shown.

‎images/themes/default/mIconProjectionDisabled.svg

Lines changed: 1 addition & 0 deletions
Loading

‎images/themes/default/mIconProjectionEnabled.png

-1005 Bytes
Binary file not shown.

‎images/themes/default/mIconProjectionEnabled.svg

Lines changed: 1 addition & 0 deletions
Loading

‎images/themes/default/transformed.svg

Lines changed: 438 additions & 23 deletions
Loading

‎src/app/qgisapp.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2493,7 +2493,7 @@ void QgisApp::createStatusBar()
24932493
// Maintain uniform widget height in status bar by setting button height same as labels
24942494
// For Qt/Mac 3.3, the default toolbutton height is 30 and labels were expanding to match
24952495
mOnTheFlyProjectionStatusButton->setMaximumHeight( mScaleWidget->height() );
2496-
mOnTheFlyProjectionStatusButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mIconProjectionEnabled.png" ) ) );
2496+
mOnTheFlyProjectionStatusButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mIconProjectionEnabled.svg" ) ) );
24972497
mOnTheFlyProjectionStatusButton->setWhatsThis( tr( "This icon shows whether "
24982498
"on the fly coordinate reference system transformation is enabled or not. "
24992499
"Click the icon to bring up "
@@ -2720,9 +2720,9 @@ void QgisApp::setTheme( const QString& theThemeName )
27202720
mActionRotateLabel->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionRotateLabel.svg" ) ) );
27212721
mActionChangeLabelProperties->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionChangeLabelProperties.svg" ) ) );
27222722
mActionDiagramProperties->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/propertyicons/diagram.svg" ) ) );
2723-
mActionDecorationCopyright->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/copyright_label.png" ) ) );
2723+
mActionDecorationCopyright->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/copyright_label.svg" ) ) );
27242724
mActionDecorationNorthArrow->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/north_arrow.png" ) ) );
2725-
mActionDecorationScaleBar->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/scale_bar.png" ) ) );
2725+
mActionDecorationScaleBar->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionScaleBar.svg" ) ) );
27262726
mActionDecorationGrid->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/transformed.svg" ) ) );
27272727

27282728
//change themes of all composers
@@ -10278,13 +10278,13 @@ void QgisApp::updateCrsStatusBar()
1027810278
mOnTheFlyProjectionStatusButton->setText( tr( "%1 (OTF)" ).arg( mOnTheFlyProjectionStatusButton->text() ) );
1027910279
mOnTheFlyProjectionStatusButton->setToolTip(
1028010280
tr( "Current CRS: %1 (OTF enabled)" ).arg( mMapCanvas->mapSettings().destinationCrs().description() ) );
10281-
mOnTheFlyProjectionStatusButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mIconProjectionEnabled.png" ) ) );
10281+
mOnTheFlyProjectionStatusButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mIconProjectionEnabled.svg" ) ) );
1028210282
}
1028310283
else
1028410284
{
1028510285
mOnTheFlyProjectionStatusButton->setToolTip(
1028610286
tr( "Current CRS: %1 (OTF disabled)" ).arg( mMapCanvas->mapSettings().destinationCrs().description() ) );
10287-
mOnTheFlyProjectionStatusButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mIconProjectionDisabled.png" ) ) );
10287+
mOnTheFlyProjectionStatusButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mIconProjectionDisabled.svg" ) ) );
1028810288
}
1028910289
}
1029010290

‎src/gui/qgsprojectionselector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ void QgsProjectionSelector::loadCrsList( QSet<QString> *crsFilter )
550550
fontTemp.setItalic( true );
551551
fontTemp.setBold( true );
552552
mGeoList->setFont( 0, fontTemp );
553-
mGeoList->setIcon( 0, QgsApplication::getThemeIcon( QStringLiteral( "/geographic.png" ) ) );
553+
mGeoList->setIcon( 0, QgsApplication::getThemeIcon( QStringLiteral( "/mIconProjectionEnabled.svg" ) ) );
554554

555555
// Projected coordinate system node
556556
mProjList = new QTreeWidgetItem( lstCoordinateSystems, QStringList( tr( "Projected Coordinate Systems" ) ) );

‎src/plugins/coordinate_capture/coordinatecapture.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ void CoordinateCapture::setCurrentTheme( const QString& theThemeName )
288288
{
289289
mpTrackMouseButton->setIcon( QIcon( getIconPath( "tracking.svg" ) ) );
290290
mpCaptureButton->setIcon( QIcon( getIconPath( "coordinate_capture.png" ) ) );
291-
mypUserCrsToolButton->setIcon( QIcon( getIconPath( "geographic.png" ) ) );
291+
mypUserCrsToolButton->setIcon( QIcon( getIconPath( "mIconProjectionEnabled.svg" ) ) );
292292
mypCRSLabel->setPixmap( QPixmap( getIconPath( QStringLiteral( "transformed.svg" ) ) ) );
293293
}
294294
}

‎src/plugins/coordinate_capture/coordinatecapture.qrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<RCC>
22
<qresource prefix="/coordinate_capture/" >
33
<file>coordinate_capture.png</file>
4-
<file>geographic.png</file>
4+
<file>mIconProjectionEnabled.svg</file>
55
<file>transformed.svg</file>
66
<file>tracking.svg</file>
77
</qresource>

‎src/plugins/coordinate_capture/geographic.png

-3.54 KB
Binary file not shown.

‎src/plugins/coordinate_capture/geographic.svg

Lines changed: 0 additions & 207 deletions
This file was deleted.

‎src/plugins/coordinate_capture/mIconProjectionEnabled.svg

Lines changed: 1 addition & 0 deletions
Loading

‎src/plugins/coordinate_capture/transformed.svg

Lines changed: 376 additions & 92 deletions
Loading

‎src/ui/qgisapp.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1805,7 +1805,7 @@ Ctrl (Cmd) increments by 15 deg.</string>
18051805
<action name="mActionDecorationCopyright">
18061806
<property name="icon">
18071807
<iconset resource="../../images/images.qrc">
1808-
<normaloff>:/images/themes/default/copyright_label.png</normaloff>:/images/themes/default/copyright_label.png</iconset>
1808+
<normaloff>:/images/themes/default/copyright_label.svg</normaloff>:/images/themes/default/copyright_label.svg</iconset>
18091809
</property>
18101810
<property name="text">
18111811
<string>&amp;Copyright Label</string>
@@ -1829,7 +1829,7 @@ Ctrl (Cmd) increments by 15 deg.</string>
18291829
<action name="mActionDecorationScaleBar">
18301830
<property name="icon">
18311831
<iconset resource="../../images/images.qrc">
1832-
<normaloff>:/images/themes/default/scale_bar.png</normaloff>:/images/themes/default/scale_bar.png</iconset>
1832+
<normaloff>:/images/themes/default/mActionScaleBar.svg</normaloff>:/images/themes/default/scale_bar.png</iconset>
18331833
</property>
18341834
<property name="text">
18351835
<string>&amp;Scale Bar</string>

0 commit comments

Comments
 (0)
Please sign in to comment.