Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Use same icons for same buttons (#3049)
* Add icons for color buttons to replace text
* Add icons to custom crs dialog
* Replace common text buttons by icons
* Replace icons
  • Loading branch information
DelazJ authored and NathanW2 committed May 1, 2016
1 parent ea1d17c commit 31e6b4b
Show file tree
Hide file tree
Showing 6 changed files with 439 additions and 520 deletions.
2 changes: 0 additions & 2 deletions src/app/qgscustomprojectiondialog.cpp
Expand Up @@ -51,8 +51,6 @@ QgsCustomProjectionDialog::QgsCustomProjectionDialog( QWidget *parent, Qt::Windo
QSettings settings;
restoreGeometry( settings.value( "/Windows/CustomProjection/geometry" ).toByteArray() );

pbnAdd->setIcon( QgsApplication::getThemeIcon( "symbologyAdd.svg" ) );
pbnRemove->setIcon( QgsApplication::getThemeIcon( "symbologyRemove.svg" ) );
// user database is created at QGIS startup in QgisApp::createDB
// we just check whether there is our database [MD]
QFileInfo myFileInfo;
Expand Down
4 changes: 2 additions & 2 deletions src/gui/symbology-ng/qgsstylev2managerdialog.cpp
Expand Up @@ -75,8 +75,8 @@ QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* pa
shareMenu->addAction( exportAction );
QAction *importAction = new QAction( tr( "Import..." ), this );
shareMenu->addAction( importAction );
exportAction->setIcon( QIcon( QgsApplication::iconPath( "mActionSharingExport.svg" ) ) );
importAction->setIcon( QIcon( QgsApplication::iconPath( "mActionSharingImport.svg" ) ) );
exportAction->setIcon( QIcon( QgsApplication::iconPath( "mActionFileSave.svg" ) ) );
importAction->setIcon( QIcon( QgsApplication::iconPath( "mActionFileOpen.svg" ) ) );
connect( actnExportAsPNG, SIGNAL( triggered() ), this, SLOT( exportItemsPNG() ) );
connect( actnExportAsSVG, SIGNAL( triggered() ), this, SLOT( exportItemsSVG() ) );
connect( exportAction, SIGNAL( triggered() ), this, SLOT( exportItems() ) );
Expand Down
16 changes: 12 additions & 4 deletions src/ui/qgscustomprojectiondialogbase.ui
Expand Up @@ -41,9 +41,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-35</y>
<width>520</width>
<height>646</height>
<y>0</y>
<width>536</width>
<height>615</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
Expand Down Expand Up @@ -109,6 +109,10 @@
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
</property>
</widget>
</item>
<item>
Expand All @@ -119,6 +123,10 @@
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
</property>
</widget>
</item>
<item>
Expand Down Expand Up @@ -193,7 +201,7 @@
<property name="title">
<string>Test</string>
</property>
<property name="collapsed" stdset="0">
<property name="collapsed">
<bool>true</bool>
</property>
<layout class="QGridLayout">
Expand Down

0 comments on commit 31e6b4b

Please sign in to comment.