birkeh/pictureLibrary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

path normalization

Browse Source
This commit is contained in:
Herwig Birke
2019-03-04 14:50:21 +01:00
parent a79d319dbd
commit d9acdb0a15
5 changed files with 39 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cimportdialog.cpp
+11 -1
View File
@@ -253,7 +253,7 @@ void cImportDialog::onImport()
szDestPath.append(QString::number(lpPicture->dateTime().date().year()) + QDir::separator() + lpPicture->dateTime().date().toString("yyyy-MM-dd") + QDir::separator());
if(!lpPicture->cameraModel().isEmpty())
szDestPath.append(lpPicture->cameraModel() + QDir::separator());
szDestPath.append(lpPicture->cameraModel().replace("/", "_").replace("\\", "_") + QDir::separator());
szDest.append(szDestPath);
szDest.append(lpPicture->fileName());
@@ -343,6 +343,16 @@ void cImportDialog::readDirectory(const QString& szPath, bool bRecursive)
else
icon = QIcon(QPixmap::fromImage(lpPicture->thumbnail()));
if(icon.isNull())
{
QPixmap pixmap(THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT);
QPainter painter(&pixmap);
painter.setBrush(Qt::black);
painter.drawRect(0, 0, THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT);
painter.end();
icon = QIcon(pixmap);
}
QStandardItem* lpItem = new QStandardItem(icon, lpPicture->fileName());
lpItem->setTextAlignment(Qt::AlignCenter);
lpItem->setData(QVariant::fromValue(lpPicture));