Skip to content

Commit 9f89b21

Browse files
nirvnnirvn
committed
[gui] refresh icons for the layer, browser, and identity panels
1 parent bfabb85 commit 9f89b21

File tree

5 files changed

+21
-12
lines changed

5 files changed

+21
-12
lines changed

‎images/images.qrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@
152152
<file>themes/default/mActionChangeLabelProperties.png</file>
153153
<file>themes/default/mActionCheckQgisVersion.png</file>
154154
<file>themes/default/mActionCollapseTree.png</file>
155+
<file>themes/default/mActionCollapseTree.svg</file>
155156
<file>themes/default/mActionComposerManager.svg</file>
156157
<file>themes/default/mActionContextHelp.png</file>
157158
<file>themes/default/mActionCopySelected.png</file>
@@ -172,7 +173,9 @@
172173
<file>themes/default/mActionEditCut.png</file>
173174
<file>themes/default/mActionEditPaste.png</file>
174175
<file>themes/default/mActionExpandNewTree.png</file>
176+
<file>themes/default/mActionExpandNewTree.svg</file>
175177
<file>themes/default/mActionExpandTree.png</file>
178+
<file>themes/default/mActionExpandTree.svg</file>
176179
<file>themes/default/mActionExportMapServer.png</file>
177180
<file>themes/default/mActionFileExit.png</file>
178181
<file>themes/default/mActionFileNew.svg</file>
@@ -184,7 +187,9 @@
184187
<file>themes/default/mActionFillRing.svg</file>
185188
<file>themes/default/mActionFilter.png</file>
186189
<file>themes/default/mActionFilter.svg</file>
190+
<file>themes/default/mActionFilter2.svg</file>
187191
<file>themes/default/mActionFolder.png</file>
192+
<file>themes/default/mActionFolder.svg</file>
188193
<file>themes/default/mActionFormAnnotation.png</file>
189194
<file>themes/default/mActionFromSelectedFeature.png</file>
190195
<file>themes/default/mActionFullCumulativeCutStretch.png</file>
@@ -195,6 +200,7 @@
195200
<file>themes/default/mActionHelpContents.svg</file>
196201
<file>themes/default/mActionHelpSponsors.png</file>
197202
<file>themes/default/mActionHideAllLayers.png</file>
203+
<file>themes/default/mActionHideAllLayers.svg</file>
198204
<file>themes/default/mActionHideSelectedLayers.png</file>
199205
<file>themes/default/mActionIdentify.svg</file>
200206
<file>themes/default/mActionIncreaseBrightness.svg</file>
@@ -233,7 +239,9 @@
233239
<file>themes/default/mActionPinLabels.svg</file>
234240
<file>themes/default/mActionProjectProperties.png</file>
235241
<file>themes/default/mActionPropertiesWidget.png</file>
242+
<file>themes/default/mActionPropertiesWidget.svg</file>
236243
<file>themes/default/mActionPropertyItem.png</file>
244+
<file>themes/default/mActionPropertyItem.svg</file>
237245
<file>themes/default/mActionQgisHomePage.png</file>
238246
<file>themes/default/mActionRaiseItems.png</file>
239247
<file>themes/default/mActionRedo.png</file>
@@ -264,6 +272,7 @@
264272
<file>themes/default/mActionSelectRectangle.svg</file>
265273
<file>themes/default/mActionSetProjection.svg</file>
266274
<file>themes/default/mActionShowAllLayers.png</file>
275+
<file>themes/default/mActionShowAllLayers.svg</file>
267276
<file>themes/default/mActionShowBookmarks.png</file>
268277
<file>themes/default/mActionShowHideLabels.svg</file>
269278
<file>themes/default/mActionShowPinnedLabels.svg</file>

‎src/app/qgisapp.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2457,15 +2457,15 @@ void QgisApp::initLayerTreeView()
24572457
// add group tool button
24582458
QToolButton* btnAddGroup = new QToolButton;
24592459
btnAddGroup->setAutoRaise( true );
2460-
btnAddGroup->setIcon( QgsApplication::getThemeIcon( "/mActionFolder.png" ) );
2460+
btnAddGroup->setIcon( QgsApplication::getThemeIcon( "/mActionFolder.svg" ) );
24612461
btnAddGroup->setToolTip( tr( "Add Group" ) );
24622462
connect( btnAddGroup, SIGNAL( clicked() ), mLayerTreeView->defaultActions(), SLOT( addGroup() ) );
24632463

24642464
// visibility groups tool button
24652465
QToolButton* btnVisibilityPresets = new QToolButton;
24662466
btnVisibilityPresets->setAutoRaise( true );
24672467
btnVisibilityPresets->setToolTip( tr( "Manage Layer Visibility" ) );
2468-
btnVisibilityPresets->setIcon( QgsApplication::getThemeIcon( "/mActionShowAllLayers.png" ) );
2468+
btnVisibilityPresets->setIcon( QgsApplication::getThemeIcon( "/mActionShowAllLayers.svg" ) );
24692469
btnVisibilityPresets->setPopupMode( QToolButton::InstantPopup );
24702470
btnVisibilityPresets->setMenu( QgsVisibilityPresets::instance()->menu() );
24712471

@@ -2474,18 +2474,18 @@ void QgisApp::initLayerTreeView()
24742474
mBtnFilterLegend->setAutoRaise( true );
24752475
mBtnFilterLegend->setCheckable( true );
24762476
mBtnFilterLegend->setToolTip( tr( "Filter Legend By Map Content" ) );
2477-
mBtnFilterLegend->setIcon( QgsApplication::getThemeIcon( "/mActionFilter.png" ) );
2477+
mBtnFilterLegend->setIcon( QgsApplication::getThemeIcon( "/mActionFilter2.svg" ) );
24782478
connect( mBtnFilterLegend, SIGNAL( clicked() ), this, SLOT( toggleFilterLegendByMap() ) );
24792479

24802480
// expand / collapse tool buttons
24812481
QToolButton* btnExpandAll = new QToolButton;
24822482
btnExpandAll->setAutoRaise( true );
2483-
btnExpandAll->setIcon( QgsApplication::getThemeIcon( "/mActionExpandTree.png" ) );
2483+
btnExpandAll->setIcon( QgsApplication::getThemeIcon( "/mActionExpandTree.svg" ) );
24842484
btnExpandAll->setToolTip( tr( "Expand All" ) );
24852485
connect( btnExpandAll, SIGNAL( clicked() ), mLayerTreeView, SLOT( expandAll() ) );
24862486
QToolButton* btnCollapseAll = new QToolButton;
24872487
btnCollapseAll->setAutoRaise( true );
2488-
btnCollapseAll->setIcon( QgsApplication::getThemeIcon( "/mActionCollapseTree.png" ) );
2488+
btnCollapseAll->setIcon( QgsApplication::getThemeIcon( "/mActionCollapseTree.svg" ) );
24892489
btnCollapseAll->setToolTip( tr( "Collapse All" ) );
24902490
connect( btnCollapseAll, SIGNAL( clicked() ), mLayerTreeView, SLOT( collapseAll() ) );
24912491

‎src/app/qgsbrowserdockwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,8 @@ QgsBrowserDockWidget::QgsBrowserDockWidget( QString name, QWidget * parent ) :
449449

450450
mBtnRefresh->setIcon( QgsApplication::getThemeIcon( "mActionDraw.svg" ) );
451451
mBtnAddLayers->setIcon( QgsApplication::getThemeIcon( "mActionAdd.svg" ) );
452-
mBtnCollapse->setIcon( QgsApplication::getThemeIcon( "mActionCollapseTree.png" ) );
453-
mBtnPropertiesWidget->setIcon( QgsApplication::getThemeIcon( "mActionPropertiesWidget.png" ) );
452+
mBtnCollapse->setIcon( QgsApplication::getThemeIcon( "mActionCollapseTree.svg" ) );
453+
mBtnPropertiesWidget->setIcon( QgsApplication::getThemeIcon( "mActionPropertiesWidget.svg" ) );
454454

455455
mWidgetFilter->hide();
456456
mLeFilter->setPlaceholderText( tr( "Type here to filter current item..." ) );

‎src/app/qgsidentifyresultsdialog.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,12 +255,12 @@ QgsIdentifyResultsDialog::QgsIdentifyResultsDialog( QgsMapCanvas *canvas, QWidge
255255
{
256256
setupUi( this );
257257

258-
mExpandToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionExpandTree.png" ) );
259-
mCollapseToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionCollapseTree.png" ) );
260-
mExpandNewToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionExpandNewTree.png" ) );
258+
mExpandToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionExpandTree.svg" ) );
259+
mCollapseToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionCollapseTree.svg" ) );
260+
mExpandNewToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionExpandNewTree.svg" ) );
261261
mCopyToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionEditCopy.png" ) );
262262
mPrintToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionFilePrint.png" ) );
263-
mOpenFormButton->setIcon( QgsApplication::getThemeIcon( "/mActionPropertyItem.png" ) );
263+
mOpenFormButton->setIcon( QgsApplication::getThemeIcon( "/mActionPropertyItem.svg" ) );
264264
mOpenFormButton->setDisabled( true );
265265

266266
QSettings mySettings;

‎src/ui/qgsbrowserdockwidgetbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
</property>
7777
<property name="icon">
7878
<iconset resource="../../images/images.qrc">
79-
<normaloff>:/images/themes/default/mActionFilter.png</normaloff>:/images/themes/default/mActionFilter.png</iconset>
79+
<normaloff>:/images/themes/default/mActionFilter2.svg</normaloff>:/images/themes/default/mActionFilter2.svg</iconset>
8080
</property>
8181
<property name="checkable">
8282
<bool>true</bool>

0 commit comments

Comments
 (0)