Skip to content

Commit 31e6b4b

Browse files
DelazJNathanW2
DelazJ
authored and
NathanW2
committedMay 1, 2016
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
·
ltr-3_40archive/master_2
1 parent ea1d17c commit 31e6b4b

File tree

6 files changed

+439
-520
lines changed

6 files changed

+439
-520
lines changed
 

‎src/app/qgscustomprojectiondialog.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ QgsCustomProjectionDialog::QgsCustomProjectionDialog( QWidget *parent, Qt::Windo
5151
QSettings settings;
5252
restoreGeometry( settings.value( "/Windows/CustomProjection/geometry" ).toByteArray() );
5353

54-
pbnAdd->setIcon( QgsApplication::getThemeIcon( "symbologyAdd.svg" ) );
55-
pbnRemove->setIcon( QgsApplication::getThemeIcon( "symbologyRemove.svg" ) );
5654
// user database is created at QGIS startup in QgisApp::createDB
5755
// we just check whether there is our database [MD]
5856
QFileInfo myFileInfo;

‎src/gui/symbology-ng/qgsstylev2managerdialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* pa
7575
shareMenu->addAction( exportAction );
7676
QAction *importAction = new QAction( tr( "Import..." ), this );
7777
shareMenu->addAction( importAction );
78-
exportAction->setIcon( QIcon( QgsApplication::iconPath( "mActionSharingExport.svg" ) ) );
79-
importAction->setIcon( QIcon( QgsApplication::iconPath( "mActionSharingImport.svg" ) ) );
78+
exportAction->setIcon( QIcon( QgsApplication::iconPath( "mActionFileSave.svg" ) ) );
79+
importAction->setIcon( QIcon( QgsApplication::iconPath( "mActionFileOpen.svg" ) ) );
8080
connect( actnExportAsPNG, SIGNAL( triggered() ), this, SLOT( exportItemsPNG() ) );
8181
connect( actnExportAsSVG, SIGNAL( triggered() ), this, SLOT( exportItemsSVG() ) );
8282
connect( exportAction, SIGNAL( triggered() ), this, SLOT( exportItems() ) );

‎src/ui/qgscustomprojectiondialogbase.ui

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
<property name="geometry">
4242
<rect>
4343
<x>0</x>
44-
<y>-35</y>
45-
<width>520</width>
46-
<height>646</height>
44+
<y>0</y>
45+
<width>536</width>
46+
<height>615</height>
4747
</rect>
4848
</property>
4949
<layout class="QGridLayout" name="gridLayout">
@@ -109,6 +109,10 @@
109109
<property name="text">
110110
<string/>
111111
</property>
112+
<property name="icon">
113+
<iconset resource="../../images/images.qrc">
114+
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
115+
</property>
112116
</widget>
113117
</item>
114118
<item>
@@ -119,6 +123,10 @@
119123
<property name="text">
120124
<string/>
121125
</property>
126+
<property name="icon">
127+
<iconset resource="../../images/images.qrc">
128+
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
129+
</property>
122130
</widget>
123131
</item>
124132
<item>
@@ -193,7 +201,7 @@
193201
<property name="title">
194202
<string>Test</string>
195203
</property>
196-
<property name="collapsed" stdset="0">
204+
<property name="collapsed">
197205
<bool>true</bool>
198206
</property>
199207
<layout class="QGridLayout">

‎src/ui/qgsoptionsbase.ui

Lines changed: 325 additions & 364 deletions
Large diffs are not rendered by default.

‎src/ui/qgsprojectpropertiesbase.ui

Lines changed: 98 additions & 146 deletions
Large diffs are not rendered by default.

‎src/ui/qgsstylev2managerdialogbase.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ QMenu::item:selected { background-color: gray; } */
506506
</property>
507507
<property name="icon">
508508
<iconset resource="../../images/images.qrc">
509-
<normaloff>:/images/themes/default/mActionSharingExport.svg</normaloff>:/images/themes/default/mActionSharingExport.svg</iconset>
509+
<normaloff>:/images/themes/default/mActionFileSave.svg</normaloff>:/images/themes/default/mActionFileSave.svg</iconset>
510510
</property>
511511
<property name="text">
512512
<string>Export selected symbol(s) as PNG...</string>
@@ -521,7 +521,7 @@ QMenu::item:selected { background-color: gray; } */
521521
</property>
522522
<property name="icon">
523523
<iconset resource="../../images/images.qrc">
524-
<normaloff>:/images/themes/default/mActionSharingExport.svg</normaloff>:/images/themes/default/mActionSharingExport.svg</iconset>
524+
<normaloff>:/images/themes/default/mActionFileSave.svg</normaloff>:/images/themes/default/mActionFileSave.svg</iconset>
525525
</property>
526526
<property name="text">
527527
<string>Export selected symbol(s) as SVG...</string>

0 commit comments

Comments
 (0)
Please sign in to comment.