Skip to content

Commit 1b85829

Browse files
nirvnnirvn
committedFeb 6, 2016
[gui] refresh selection-related icons
·
ltr-3_40archive/master_2
1 parent f2a05f2 commit 1b85829

16 files changed

+393
-180
lines changed
 

‎images/images.qrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@
219219
<file>themes/default/mActionIncreaseContrast.svg</file>
220220
<file>themes/default/mActionInOverview.svg</file>
221221
<file>themes/default/mActionInvertSelection.png</file>
222+
<file>themes/default/mActionInvertSelection.svg</file>
222223
<file>themes/default/mActionLabel.png</file>
223224
<file>themes/default/mActionLabeling.png</file>
224225
<file>themes/default/mActionLocalCumulativeCutStretch.png</file>
@@ -277,6 +278,7 @@
277278
<file>themes/default/mActionScaleBar.png</file>
278279
<file>themes/default/mActionSelect.svg</file>
279280
<file>themes/default/mActionSelectAll.png</file>
281+
<file>themes/default/mActionSelectAll.svg</file>
280282
<file>themes/default/mActionSelectedToTop.png</file>
281283
<file>themes/default/mActionSelectFreehand.svg</file>
282284
<file>themes/default/mActionSelectPan.png</file>

‎images/themes/default/mActionDeselectAll.svg

Lines changed: 91 additions & 30 deletions
Loading

‎images/themes/default/mActionInvertSelection.svg

Lines changed: 67 additions & 0 deletions
Loading

‎images/themes/default/mActionPanToSelected.svg

Lines changed: 14 additions & 13 deletions
Loading

‎images/themes/default/mActionSelectAll.svg

Lines changed: 75 additions & 0 deletions
Loading

‎images/themes/default/mActionSelectFreehand.svg

Lines changed: 22 additions & 23 deletions
Loading

‎images/themes/default/mActionSelectPolygon.svg

Lines changed: 25 additions & 19 deletions
Loading

‎images/themes/default/mActionSelectRadius.svg

Lines changed: 27 additions & 24 deletions
Loading

‎images/themes/default/mActionSelectRectangle.svg

Lines changed: 19 additions & 19 deletions
Loading

‎images/themes/default/mActionZoomToLayer.svg

Lines changed: 11 additions & 11 deletions
Loading

‎images/themes/default/mActionZoomToSelected.svg

Lines changed: 16 additions & 15 deletions
Loading

‎images/themes/default/mIconExpressionSelect.svg

Lines changed: 14 additions & 16 deletions
Loading

‎src/app/qgisapp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2309,8 +2309,8 @@ void QgisApp::setTheme( const QString& theThemeName )
23092309
mActionSelectFreehand->setIcon( QgsApplication::getThemeIcon( "/mActionSelectFreehand.svg" ) );
23102310
mActionSelectRadius->setIcon( QgsApplication::getThemeIcon( "/mActionSelectRadius.svg" ) );
23112311
mActionDeselectAll->setIcon( QgsApplication::getThemeIcon( "/mActionDeselectAll.svg" ) );
2312-
mActionSelectAll->setIcon( QgsApplication::getThemeIcon( "/mActionSelectAll.png" ) );
2313-
mActionInvertSelection->setIcon( QgsApplication::getThemeIcon( "/mActionInvertSelection.png" ) );
2312+
mActionSelectAll->setIcon( QgsApplication::getThemeIcon( "/mActionSelectAll.svg" ) );
2313+
mActionInvertSelection->setIcon( QgsApplication::getThemeIcon( "/mActionInvertSelection.svg" ) );
23142314
mActionSelectByExpression->setIcon( QgsApplication::getThemeIcon( "/mIconExpressionSelect.svg" ) );
23152315
mActionOpenTable->setIcon( QgsApplication::getThemeIcon( "/mActionOpenTable.png" ) );
23162316
mActionOpenFieldCalc->setIcon( QgsApplication::getThemeIcon( "/mActionCalculateField.png" ) );

‎src/app/qgsattributetabledialog.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
118118
mApplyFilterButton->setDefaultAction( mActionApplyFilter );
119119

120120
// Set filter icon in a couple of places
121-
QIcon filterIcon = QgsApplication::getThemeIcon( "/mActionFilter.svg" );
121+
QIcon filterIcon = QgsApplication::getThemeIcon( "/mActionFilter2.svg" );
122122
mActionShowAllFilter->setIcon( filterIcon );
123123
mActionAdvancedFilter->setIcon( filterIcon );
124124
mActionSelectedFilter->setIcon( filterIcon );
@@ -166,12 +166,12 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
166166
updateTitle();
167167

168168
mRemoveSelectionButton->setIcon( QgsApplication::getThemeIcon( "/mActionUnselectAttributes.png" ) );
169-
mSelectAllButton->setIcon( QgsApplication::getThemeIcon( "/mActionSelectAll.png" ) );
169+
mSelectAllButton->setIcon( QgsApplication::getThemeIcon( "/mActionSelectAll.svg" ) );
170170
mSelectedToTopButton->setIcon( QgsApplication::getThemeIcon( "/mActionSelectedToTop.png" ) );
171171
mCopySelectedRowsButton->setIcon( QgsApplication::getThemeIcon( "/mActionCopySelected.png" ) );
172172
mZoomMapToSelectedRowsButton->setIcon( QgsApplication::getThemeIcon( "/mActionZoomToSelected.svg" ) );
173173
mPanMapToSelectedRowsButton->setIcon( QgsApplication::getThemeIcon( "/mActionPanToSelected.svg" ) );
174-
mInvertSelectionButton->setIcon( QgsApplication::getThemeIcon( "/mActionInvertSelection.png" ) );
174+
mInvertSelectionButton->setIcon( QgsApplication::getThemeIcon( "/mActionInvertSelection.svg" ) );
175175
mToggleEditingButton->setIcon( QgsApplication::getThemeIcon( "/mActionToggleEditing.svg" ) );
176176
mSaveEditsButton->setIcon( QgsApplication::getThemeIcon( "/mActionSaveEdits.svg" ) );
177177
mDeleteSelectedButton->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteSelected.svg" ) );

‎src/ui/qgisapp.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@
10041004
<action name="mActionSelectAll">
10051005
<property name="icon">
10061006
<iconset resource="../../images/images.qrc">
1007-
<normaloff>:/images/themes/default/mActionSelectAll.png</normaloff>:/images/themes/default/mActionSelectAll.png</iconset>
1007+
<normaloff>:/images/themes/default/mActionSelectAll.svg</normaloff>:/images/themes/default/mActionSelectAll.svg</iconset>
10081008
</property>
10091009
<property name="text">
10101010
<string>Select All Features</string>
@@ -1019,7 +1019,7 @@
10191019
<action name="mActionInvertSelection">
10201020
<property name="icon">
10211021
<iconset resource="../../images/images.qrc">
1022-
<normaloff>:/images/themes/default/mActionInvertSelection.png</normaloff>:/images/themes/default/mActionInvertSelection.png</iconset>
1022+
<normaloff>:/images/themes/default/mActionInvertSelection.svg</normaloff>:/images/themes/default/mActionInvertSelection.svg</iconset>
10231023
</property>
10241024
<property name="text">
10251025
<string>Invert Feature Selection</string>

‎src/ui/qgsattributetabledialog.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
</property>
118118
<property name="icon">
119119
<iconset resource="../../images/images.qrc">
120-
<normaloff>:/images/themes/default/mActionRefresh.png</normaloff>:/images/themes/default/mActionRefresh.png</iconset>
120+
<normaloff>:/images/themes/default/mActionDraw.svg</normaloff>:/images/themes/default/mActionDraw.svg</iconset>
121121
</property>
122122
<property name="iconSize">
123123
<size>
@@ -225,7 +225,7 @@
225225
</property>
226226
<property name="icon">
227227
<iconset resource="../../images/images.qrc">
228-
<normaloff>:/images/themes/default/mActionSelectAll.png</normaloff>:/images/themes/default/mActionSelectAll.png</iconset>
228+
<normaloff>:/images/themes/default/mActionSelectAll.svg</normaloff>:/images/themes/default/mActionSelectAll.svg</iconset>
229229
</property>
230230
<property name="iconSize">
231231
<size>
@@ -251,7 +251,7 @@
251251
</property>
252252
<property name="icon">
253253
<iconset resource="../../images/images.qrc">
254-
<normaloff>:/images/themes/default/mActionInvertSelection.png</normaloff>:/images/themes/default/mActionInvertSelection.png</iconset>
254+
<normaloff>:/images/themes/default/mActionInvertSelection.svg</normaloff>:/images/themes/default/mActionInvertSelection.svg</iconset>
255255
</property>
256256
<property name="iconSize">
257257
<size>

0 commit comments

Comments
 (0)
Please sign in to comment.