Skip to content

Commit

Permalink
[gui] refresh icons for the layer, browser, and identity panels
Browse files Browse the repository at this point in the history
  • Loading branch information
@nirvn
nirvn committed May 28, 2015
1 parent bfabb85 commit 9f89b21
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 12 deletions.
9 changes: 9 additions & 0 deletions images/images.qrc
View file
Expand Up @@ -152,6 +152,7 @@
<file>themes/default/mActionChangeLabelProperties.png</file>
<file>themes/default/mActionCheckQgisVersion.png</file>
<file>themes/default/mActionCollapseTree.png</file>
<file>themes/default/mActionCollapseTree.svg</file>
<file>themes/default/mActionComposerManager.svg</file>
<file>themes/default/mActionContextHelp.png</file>
<file>themes/default/mActionCopySelected.png</file>
Expand All @@ -172,7 +173,9 @@
<file>themes/default/mActionEditCut.png</file>
<file>themes/default/mActionEditPaste.png</file>
<file>themes/default/mActionExpandNewTree.png</file>
<file>themes/default/mActionExpandNewTree.svg</file>
<file>themes/default/mActionExpandTree.png</file>
<file>themes/default/mActionExpandTree.svg</file>
<file>themes/default/mActionExportMapServer.png</file>
<file>themes/default/mActionFileExit.png</file>
<file>themes/default/mActionFileNew.svg</file>
Expand All @@ -184,7 +187,9 @@
<file>themes/default/mActionFillRing.svg</file>
<file>themes/default/mActionFilter.png</file>
<file>themes/default/mActionFilter.svg</file>
<file>themes/default/mActionFilter2.svg</file>
<file>themes/default/mActionFolder.png</file>
<file>themes/default/mActionFolder.svg</file>
<file>themes/default/mActionFormAnnotation.png</file>
<file>themes/default/mActionFromSelectedFeature.png</file>
<file>themes/default/mActionFullCumulativeCutStretch.png</file>
Expand All @@ -195,6 +200,7 @@
<file>themes/default/mActionHelpContents.svg</file>
<file>themes/default/mActionHelpSponsors.png</file>
<file>themes/default/mActionHideAllLayers.png</file>
<file>themes/default/mActionHideAllLayers.svg</file>
<file>themes/default/mActionHideSelectedLayers.png</file>
<file>themes/default/mActionIdentify.svg</file>
<file>themes/default/mActionIncreaseBrightness.svg</file>
Expand Down Expand Up @@ -233,7 +239,9 @@
<file>themes/default/mActionPinLabels.svg</file>
<file>themes/default/mActionProjectProperties.png</file>
<file>themes/default/mActionPropertiesWidget.png</file>
<file>themes/default/mActionPropertiesWidget.svg</file>
<file>themes/default/mActionPropertyItem.png</file>
<file>themes/default/mActionPropertyItem.svg</file>
<file>themes/default/mActionQgisHomePage.png</file>
<file>themes/default/mActionRaiseItems.png</file>
<file>themes/default/mActionRedo.png</file>
Expand Down Expand Up @@ -264,6 +272,7 @@
<file>themes/default/mActionSelectRectangle.svg</file>
<file>themes/default/mActionSetProjection.svg</file>
<file>themes/default/mActionShowAllLayers.png</file>
<file>themes/default/mActionShowAllLayers.svg</file>
<file>themes/default/mActionShowBookmarks.png</file>
<file>themes/default/mActionShowHideLabels.svg</file>
<file>themes/default/mActionShowPinnedLabels.svg</file>
Expand Down
10 changes: 5 additions & 5 deletions src/app/qgisapp.cpp
View file
Expand Up @@ -2457,15 +2457,15 @@ void QgisApp::initLayerTreeView()
// add group tool button
QToolButton* btnAddGroup = new QToolButton;
btnAddGroup->setAutoRaise( true );
btnAddGroup->setIcon( QgsApplication::getThemeIcon( "/mActionFolder.png" ) );
btnAddGroup->setIcon( QgsApplication::getThemeIcon( "/mActionFolder.svg" ) );
btnAddGroup->setToolTip( tr( "Add Group" ) );
connect( btnAddGroup, SIGNAL( clicked() ), mLayerTreeView->defaultActions(), SLOT( addGroup() ) );

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

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

// expand / collapse tool buttons
QToolButton* btnExpandAll = new QToolButton;
btnExpandAll->setAutoRaise( true );
btnExpandAll->setIcon( QgsApplication::getThemeIcon( "/mActionExpandTree.png" ) );
btnExpandAll->setIcon( QgsApplication::getThemeIcon( "/mActionExpandTree.svg" ) );
btnExpandAll->setToolTip( tr( "Expand All" ) );
connect( btnExpandAll, SIGNAL( clicked() ), mLayerTreeView, SLOT( expandAll() ) );
QToolButton* btnCollapseAll = new QToolButton;
btnCollapseAll->setAutoRaise( true );
btnCollapseAll->setIcon( QgsApplication::getThemeIcon( "/mActionCollapseTree.png" ) );
btnCollapseAll->setIcon( QgsApplication::getThemeIcon( "/mActionCollapseTree.svg" ) );
btnCollapseAll->setToolTip( tr( "Collapse All" ) );
connect( btnCollapseAll, SIGNAL( clicked() ), mLayerTreeView, SLOT( collapseAll() ) );

Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsbrowserdockwidget.cpp
View file
Expand Up @@ -449,8 +449,8 @@ QgsBrowserDockWidget::QgsBrowserDockWidget( QString name, QWidget * parent ) :

mBtnRefresh->setIcon( QgsApplication::getThemeIcon( "mActionDraw.svg" ) );
mBtnAddLayers->setIcon( QgsApplication::getThemeIcon( "mActionAdd.svg" ) );
mBtnCollapse->setIcon( QgsApplication::getThemeIcon( "mActionCollapseTree.png" ) );
mBtnPropertiesWidget->setIcon( QgsApplication::getThemeIcon( "mActionPropertiesWidget.png" ) );
mBtnCollapse->setIcon( QgsApplication::getThemeIcon( "mActionCollapseTree.svg" ) );
mBtnPropertiesWidget->setIcon( QgsApplication::getThemeIcon( "mActionPropertiesWidget.svg" ) );

mWidgetFilter->hide();
mLeFilter->setPlaceholderText( tr( "Type here to filter current item..." ) );
Expand Down
8 changes: 4 additions & 4 deletions src/app/qgsidentifyresultsdialog.cpp
View file
Expand Up @@ -255,12 +255,12 @@ QgsIdentifyResultsDialog::QgsIdentifyResultsDialog( QgsMapCanvas *canvas, QWidge
{
setupUi( this );

mExpandToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionExpandTree.png" ) );
mCollapseToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionCollapseTree.png" ) );
mExpandNewToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionExpandNewTree.png" ) );
mExpandToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionExpandTree.svg" ) );
mCollapseToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionCollapseTree.svg" ) );
mExpandNewToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionExpandNewTree.svg" ) );
mCopyToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionEditCopy.png" ) );
mPrintToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionFilePrint.png" ) );
mOpenFormButton->setIcon( QgsApplication::getThemeIcon( "/mActionPropertyItem.png" ) );
mOpenFormButton->setIcon( QgsApplication::getThemeIcon( "/mActionPropertyItem.svg" ) );
mOpenFormButton->setDisabled( true );

QSettings mySettings;
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgsbrowserdockwidgetbase.ui
View file
Expand Up @@ -76,7 +76,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionFilter.png</normaloff>:/images/themes/default/mActionFilter.png</iconset>
<normaloff>:/images/themes/default/mActionFilter2.svg</normaloff>:/images/themes/default/mActionFilter2.svg</iconset>
</property>
<property name="checkable">
<bool>true</bool>
Expand Down

0 comments on commit 9f89b21

Please sign in to comment.