@@ -84,17 +84,17 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
84
84
85
85
updateTitle ();
86
86
87
- mRemoveSelectionButton ->setIcon ( getThemeIcon ( " /mActionUnselectAttributes.png" ) );
88
- mSelectedToTopButton ->setIcon ( getThemeIcon ( " /mActionSelectedToTop.png" ) );
89
- mCopySelectedRowsButton ->setIcon ( getThemeIcon ( " /mActionCopySelected.png" ) );
90
- mZoomMapToSelectedRowsButton ->setIcon ( getThemeIcon ( " /mActionZoomToSelected.png" ) );
91
- mInvertSelectionButton ->setIcon ( getThemeIcon ( " /mActionInvertSelection.png" ) );
92
- mToggleEditingButton ->setIcon ( getThemeIcon ( " /mActionToggleEditing.png" ) );
93
- mSaveEditsButton ->setIcon ( getThemeIcon ( " /mActionSaveEdits.png" ) );
94
- mDeleteSelectedButton ->setIcon ( getThemeIcon ( " /mActionDeleteSelected.png" ) );
95
- mOpenFieldCalculator ->setIcon ( getThemeIcon ( " /mActionCalculateField.png" ) );
96
- mAddAttribute ->setIcon ( getThemeIcon ( " /mActionNewAttribute.png" ) );
97
- mRemoveAttribute ->setIcon ( getThemeIcon ( " /mActionDeleteAttribute.png" ) );
87
+ mRemoveSelectionButton ->setIcon ( QgisApp:: getThemeIcon ( " /mActionUnselectAttributes.png" ) );
88
+ mSelectedToTopButton ->setIcon ( QgisApp:: getThemeIcon ( " /mActionSelectedToTop.png" ) );
89
+ mCopySelectedRowsButton ->setIcon ( QgisApp:: getThemeIcon ( " /mActionCopySelected.png" ) );
90
+ mZoomMapToSelectedRowsButton ->setIcon ( QgisApp:: getThemeIcon ( " /mActionZoomToSelected.png" ) );
91
+ mInvertSelectionButton ->setIcon ( QgisApp:: getThemeIcon ( " /mActionInvertSelection.png" ) );
92
+ mToggleEditingButton ->setIcon ( QgisApp:: getThemeIcon ( " /mActionToggleEditing.png" ) );
93
+ mSaveEditsButton ->setIcon ( QgisApp:: getThemeIcon ( " /mActionSaveEdits.png" ) );
94
+ mDeleteSelectedButton ->setIcon ( QgisApp:: getThemeIcon ( " /mActionDeleteSelected.png" ) );
95
+ mOpenFieldCalculator ->setIcon ( QgisApp:: getThemeIcon ( " /mActionCalculateField.png" ) );
96
+ mAddAttribute ->setIcon ( QgisApp:: getThemeIcon ( " /mActionNewAttribute.png" ) );
97
+ mRemoveAttribute ->setIcon ( QgisApp:: getThemeIcon ( " /mActionDeleteAttribute.png" ) );
98
98
99
99
// toggle editing
100
100
bool canChangeAttributes = mLayer ->dataProvider ()->capabilities () & QgsVectorDataProvider::ChangeAttributeValues;
@@ -173,28 +173,6 @@ void QgsAttributeTableDialog::closeEvent( QCloseEvent* event )
173
173
}
174
174
175
175
176
- QIcon QgsAttributeTableDialog::getThemeIcon ( const QString theName )
177
- {
178
- // copied from QgisApp::getThemeIcon. To be removed when merged to SVN
179
-
180
- QString myPreferredPath = QgsApplication::activeThemePath () + QDir::separator () + theName;
181
- QString myDefaultPath = QgsApplication::defaultThemePath () + QDir::separator () + theName;
182
- if ( QFile::exists ( myPreferredPath ) )
183
- {
184
- return QIcon ( myPreferredPath );
185
- }
186
- else if ( QFile::exists ( myDefaultPath ) )
187
- {
188
- // could still return an empty icon if it
189
- // doesnt exist in the default theme either!
190
- return QIcon ( myDefaultPath );
191
- }
192
- else
193
- {
194
- return QIcon ();
195
- }
196
- }
197
-
198
176
void QgsAttributeTableDialog::showAdvanced ()
199
177
{
200
178
mMenuActions ->exec ( QCursor::pos () );
0 commit comments