Skip to content

Commit

Permalink
Updated and vectorized several icons (#6362)
Browse files Browse the repository at this point in the history 
mActionFileExit
repositoryUnavailable
repositoryDisabled
repositoryConnected
mActionRefresh
mIconDelete
mActionRemoveSelectedFeature
mActionFromSelectedFeature
  • Loading branch information
@nirvn
Felis Pimeja authored and nirvn committed Feb 17, 2018
1 parent 7e4cdc0 commit dedfb5c
Show file tree
Hide file tree
Showing 28 changed files with 31 additions and 24 deletions.
16 changes: 8 additions & 8 deletions images/images.qrc
View file
Expand Up @@ -218,7 +218,7 @@
<file>themes/default/mActionEditPaste.svg</file>
<file>themes/default/mActionExpandNewTree.svg</file>
<file>themes/default/mActionExpandTree.svg</file>
<file>themes/default/mActionFileExit.png</file>
<file>themes/default/mActionFileExit.svg</file>
<file>themes/default/mActionFileNew.svg</file>
<file>themes/default/mActionFileOpen.svg</file>
<file>themes/default/mActionFilePrint.svg</file>
Expand All @@ -229,7 +229,7 @@
<file>themes/default/mActionFilter2.svg</file>
<file>themes/default/mActionFolder.svg</file>
<file>themes/default/mActionFormAnnotation.svg</file>
<file>themes/default/mActionFromSelectedFeature.png</file>
<file>themes/default/mActionFromSelectedFeature.svg</file>
<file>themes/default/mActionFormView.svg</file>
<file>themes/default/mActionFullCumulativeCutStretch.svg</file>
<file>themes/default/mActionFullHistogramStretch.svg</file>
Expand Down Expand Up @@ -289,11 +289,11 @@
<file>themes/default/mActionQgisHomePage.png</file>
<file>themes/default/mActionRaiseItems.svg</file>
<file>themes/default/mActionRedo.svg</file>
<file>themes/default/mActionRefresh.png</file>
<file>themes/default/mActionRefresh.svg</file>
<file>themes/default/mActionRemove.svg</file>
<file>themes/default/mActionRemoveAllFromOverview.svg</file>
<file>themes/default/mActionRemoveLayer.svg</file>
<file>themes/default/mActionRemoveSelectedFeature.png</file>
<file>themes/default/mActionRemoveSelectedFeature.svg</file>
<file>themes/default/mActionReshape.svg</file>
<file>themes/default/mActionResizeNarrowest.svg</file>
<file>themes/default/mActionResizeShortest.svg</file>
Expand Down Expand Up @@ -382,7 +382,7 @@
<file>themes/default/mIconDataDefineExpressionOn.svg</file>
<file>themes/default/mIconDb2.svg</file>
<file>themes/default/mIconDbSchema.png</file>
<file>themes/default/mIconDelete.png</file>
<file>themes/default/mIconDelete.svg</file>
<file>themes/default/mIconDeselected.svg</file>
<file>themes/default/mIconDropDownMenu.svg</file>
<file>themes/default/mIconJoinNotEditable.svg</file>
Expand Down Expand Up @@ -517,9 +517,9 @@
<file>themes/default/labelingSingle.svg</file>
<file>themes/default/labelingRuleBased.svg</file>
<file>themes/default/labelingObstacle.svg</file>
<file>themes/default/repositoryConnected.png</file>
<file>themes/default/repositoryDisabled.png</file>
<file>themes/default/repositoryUnavailable.png</file>
<file>themes/default/repositoryConnected.svg</file>
<file>themes/default/repositoryDisabled.svg</file>
<file>themes/default/repositoryUnavailable.svg</file>
<file>themes/default/stars_empty.svg</file>
<file>themes/default/stars_full.svg</file>
<file>themes/default/styleicons/color.svg</file>
Expand Down
Binary file removed images/themes/default/mActionFileExit.png
View file
Binary file not shown.
1 change: 1 addition & 0 deletions images/themes/default/mActionFileExit.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/themes/default/mActionFromSelectedFeature.png
View file
Binary file not shown.
1 change: 1 addition & 0 deletions images/themes/default/mActionFromSelectedFeature.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/themes/default/mActionRefresh.png
View file
Binary file not shown.
1 change: 1 addition & 0 deletions images/themes/default/mActionRefresh.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/themes/default/mActionRemoveSelectedFeature.png
View file
Binary file not shown.
1 change: 1 addition & 0 deletions images/themes/default/mActionRemoveSelectedFeature.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/themes/default/mIconDelete.png
View file
Binary file not shown.
1 change: 1 addition & 0 deletions images/themes/default/mIconDelete.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/themes/default/repositoryConnected.png
View file
Binary file not shown.
1 change: 1 addition & 0 deletions images/themes/default/repositoryConnected.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/themes/default/repositoryDisabled.png
View file
Binary file not shown.
1 change: 1 addition & 0 deletions images/themes/default/repositoryDisabled.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/themes/default/repositoryUnavailable.png
View file
Binary file not shown.
1 change: 1 addition & 0 deletions images/themes/default/repositoryUnavailable.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/app/pluginmanager/qgspluginmanager.cpp
View file
Expand Up @@ -1049,20 +1049,20 @@ void QgsPluginManager::addToRepositoryList( const QMap<QString, QString> &reposi
if ( repository.value( QStringLiteral( "state" ) ) == QLatin1String( "2" ) )
{
a->setText( 0, tr( "connected" ) );
a->setIcon( 0, QIcon( ":/images/themes/default/repositoryConnected.png" ) );
a->setIcon( 0, QIcon( ":/images/themes/default/repositoryConnected.svg" ) );
a->setToolTip( 0, tr( "The repository is connected" ) );
}
else
{
a->setText( 0, tr( "unavailable" ) );
a->setIcon( 0, QIcon( ":/images/themes/default/repositoryUnavailable.png" ) );
a->setIcon( 0, QIcon( ":/images/themes/default/repositoryUnavailable.svg" ) );
a->setToolTip( 0, tr( "The repository is enabled, but unavailable" ) );
}
}
else
{
a->setText( 0, tr( "disabled" ) );
a->setIcon( 0, QIcon( ":/images/themes/default/repositoryDisabled.png" ) );
a->setIcon( 0, QIcon( ":/images/themes/default/repositoryDisabled.svg" ) );
if ( repository.value( QStringLiteral( "valid" ) ) == QLatin1String( "true" ) )
{
a->setToolTip( 0, tr( "The repository is disabled" ) );
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsmergeattributesdialog.cpp
View file
Expand Up @@ -70,8 +70,8 @@ QgsMergeAttributesDialog::QgsMergeAttributesDialog( const QgsFeatureList &featur
mTableWidget->setSelectionBehavior( QAbstractItemView::SelectRows );
mTableWidget->setSelectionMode( QAbstractItemView::SingleSelection );

mFromSelectedPushButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mActionFromSelectedFeature.png" ) ) );
mRemoveFeatureFromSelectionButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mActionRemoveSelectedFeature.png" ) ) );
mFromSelectedPushButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mActionFromSelectedFeature.svg" ) ) );
mRemoveFeatureFromSelectionButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mActionRemoveSelectedFeature.svg" ) ) );

QgsSettings settings;
restoreGeometry( settings.value( QStringLiteral( "Windows/MergeAttributes/geometry" ) ).toByteArray() );
Expand Down
3 changes: 1 addition & 2 deletions src/core/qgsdataitem.cpp
View file
Expand Up @@ -1093,7 +1093,7 @@ QgsProjectItem::QgsProjectItem( QgsDataItem *parent, const QString &name, const
QgsErrorItem::QgsErrorItem( QgsDataItem *parent, const QString &error, const QString &path )
: QgsDataItem( QgsDataItem::Error, parent, error, path )
{
mIconName = QStringLiteral( "/mIconDelete.png" );
mIconName = QStringLiteral( "/mIconDelete.svg" );

setState( Populated ); // no more children
}
Expand Down Expand Up @@ -1628,4 +1628,3 @@ void QgsFavoriteItem::rename( const QString &name )


///@endcond

2 changes: 1 addition & 1 deletion src/plugins/geometry_checker/qgsgeometrycheckerresulttab.ui
View file
Expand Up @@ -203,7 +203,7 @@
</property>
<property name="icon">
<iconset resource="../../../../images/images.qrc">
<normaloff>:/images/themes/default/mActionFromSelectedFeature.png</normaloff>:/images/themes/default/mActionFromSelectedFeature.png</iconset>
<normaloff>:/images/themes/default/mActionFromSelectedFeature.svg</normaloff>:/images/themes/default/mActionFromSelectedFeature.scg</iconset>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/globe/qgsglobewidget.cpp
View file
Expand Up @@ -49,7 +49,7 @@ QgsGlobeWidget::QgsGlobeWidget( QgisInterface *iface, QWidget *parent )
QToolButton *refreshButton = new QToolButton( this );
refreshButton->setAutoRaise( true );
refreshButton->setToolTip( tr( "Reload scene" ) );
refreshButton->setIcon( QIcon( ":/images/themes/default/mActionRefresh.png" ) );
refreshButton->setIcon( QIcon( ":/images/themes/default/mActionRefresh.svg" ) );
refreshButton->setIconSize( QSize( 16, 16 ) );
connect( refreshButton, SIGNAL( clicked() ), this, SIGNAL( refresh() ) );

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/qgsgrasstools.cpp
View file
Expand Up @@ -57,7 +57,7 @@ QgsGrassTools::QgsGrassTools( QgisInterface *iface, QWidget *parent, const char
connect( mDebugButton, &QPushButton::clicked, this, &QgsGrassTools::mDebugButton_clicked );
connect( mCloseDebugButton, &QPushButton::clicked, this, &QgsGrassTools::mCloseDebugButton_clicked );
connect( mViewModeButton, &QToolButton::clicked, this, &QgsGrassTools::mViewModeButton_clicked );
QPushButton *closeMapsetButton = new QPushButton( QgsApplication::getThemeIcon( QStringLiteral( "mActionFileExit.png" ) ), tr( "Close mapset" ), this );
QPushButton *closeMapsetButton = new QPushButton( QgsApplication::getThemeIcon( QStringLiteral( "mActionFileExit.svg" ) ), tr( "Close mapset" ), this );
mTabWidget->setCornerWidget( closeMapsetButton );
connect( closeMapsetButton, &QAbstractButton::clicked, this, &QgsGrassTools::closeMapset );

Expand Down
4 changes: 2 additions & 2 deletions src/providers/grass/qgsgrassprovidermodule.cpp
View file
Expand Up @@ -995,7 +995,7 @@ QgsGrassVectorItem::QgsGrassVectorItem( QgsDataItem *parent, QgsGrassObject gras
if ( !mValid )
{
setState( Populated );
setIconName( QStringLiteral( "/mIconDelete.png" ) );
setIconName( QStringLiteral( "/mIconDelete.svg" ) );
}
#ifdef HAVE_GUI
mActions = new QgsGrassItemActions( mGrassObject, mValid, this );
Expand Down Expand Up @@ -1219,7 +1219,7 @@ QIcon QgsGrassImportItem::icon()
{
if ( mImport && mImport->isCanceled() )
{
setIconName( QStringLiteral( "/mIconDelete.png" ) );
setIconName( QStringLiteral( "/mIconDelete.svg" ) );
return QgsDataItem::icon();
}
else
Expand Down
2 changes: 1 addition & 1 deletion src/ui/auth/qgsauthauthoritieseditor.ui
View file
Expand Up @@ -189,7 +189,7 @@
</property>
<property name="icon">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/mActionRefresh.png</normaloff>:/images/themes/default/mActionRefresh.png</iconset>
<normaloff>:/images/themes/default/mActionRefresh.svg</normaloff>:/images/themes/default/mActionRefresh.svg</iconset>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/auth/qgsauthidentitieseditor.ui
View file
Expand Up @@ -137,7 +137,7 @@
</property>
<property name="icon">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/mActionRefresh.png</normaloff>:/images/themes/default/mActionRefresh.png</iconset>
<normaloff>:/images/themes/default/mActionRefresh.svg</normaloff>:/images/themes/default/mActionRefresh.svg</iconset>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/auth/qgsauthserverseditor.ui
View file
Expand Up @@ -134,7 +134,7 @@
</property>
<property name="icon">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/mActionRefresh.png</normaloff>:/images/themes/default/mActionRefresh.png</iconset>
<normaloff>:/images/themes/default/mActionRefresh.svg</normaloff>:/images/themes/default/mActionRefresh.svg</iconset>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgisapp.ui
View file
Expand Up @@ -741,7 +741,7 @@
<action name="mActionExit">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionFileExit.png</normaloff>:/images/themes/default/mActionFileExit.png</iconset>
<normaloff>:/images/themes/default/mActionFileExit.svg</normaloff>:/images/themes/default/mActionFileExit.png</iconset>
</property>
<property name="text">
<string>Exit QGIS</string>
Expand Down

0 comments on commit dedfb5c

Please sign in to comment.