Merge pull request #32 from 02JanDal/feature_ico_icons
Make .ico files usable (the plugin is already included)
This commit is contained in:
commit
aa5f2c8120
@ -103,7 +103,7 @@ void IconPickerDialog::addNewIcon()
|
|||||||
QString selectIcons = tr("Select Icons");
|
QString selectIcons = tr("Select Icons");
|
||||||
//: The type of icon files
|
//: The type of icon files
|
||||||
QStringList fileNames = QFileDialog::getOpenFileNames(this, selectIcons, QString(),
|
QStringList fileNames = QFileDialog::getOpenFileNames(this, selectIcons, QString(),
|
||||||
tr("Icons") + "(*.png *.jpg *.jpeg)");
|
tr("Icons") + "(*.png *.jpg *.jpeg *.ico)");
|
||||||
MMC->icons()->installIcons(fileNames);
|
MMC->icons()->installIcons(fileNames);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -258,7 +258,7 @@ void IconList::installIcons(QStringList iconFiles)
|
|||||||
QString target = PathCombine("icons", fileinfo.fileName());
|
QString target = PathCombine("icons", fileinfo.fileName());
|
||||||
|
|
||||||
QString suffix = fileinfo.suffix();
|
QString suffix = fileinfo.suffix();
|
||||||
if (suffix != "jpeg" && suffix != "png" && suffix != "jpg")
|
if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico")
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!QFile::copy(file, target))
|
if (!QFile::copy(file, target))
|
||||||
@ -348,4 +348,4 @@ int IconList::getIconIndex(QString key)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
//#include "IconList.moc"
|
//#include "IconList.moc"
|
||||||
|
Loading…
Reference in New Issue
Block a user