creation date

master
Herwig Birke 7 years ago
parent 33527187f3
commit e1fc0648ce

@ -342,7 +342,7 @@ QString cEXIF::cameraModel()
QDateTime cEXIF::dateTime()
{
QDateTime dateTime = QDateTime::fromString(getEXIFTag(0x0132, 1).value<QString>(), "yyyy:MM:dd hh:mm:ss");
QDateTime dateTime = QDateTime::fromString(getEXIFTag(0x9004, 1).value<QString>(), "yyyy:MM:dd hh:mm:ss");
if(dateTime.isValid())
return(dateTime);
@ -350,6 +350,10 @@ QDateTime cEXIF::dateTime()
if(dateTime.isValid())
return(dateTime);
dateTime = QDateTime::fromString(getEXIFTag(0x0132, 1).value<QString>(), "yyyy:MM:dd hh:mm:ss");
if(dateTime.isValid())
return(dateTime);
QFileInfo info(m_szFileName);
return(info.lastModified());
}

@ -260,7 +260,11 @@ void cMainWindow::loadData(bool bProgressBar)
m_tagList.load(m_lpSplashScreen, bProgressBar ? m_lpProgressBar : nullptr);
m_pictureList.clear();
if(bProgressBar)
m_lpProgressBar->setVisible(true);
m_pictureList.load(m_personList, m_locationList, m_tagList, m_lpSplashScreen, bProgressBar ? m_lpProgressBar : nullptr);
if(bProgressBar)
m_lpProgressBar->setVisible(false);
displayData();
@ -591,7 +595,7 @@ void cMainWindow::onFileOpen()
if(!m_pictureLibrary.openDatabase(szPath))
return;
loadData(m_lpProgressBar);
loadData(true);
setCurrentFile(szPath);
m_szOldPath = szPath;

Loading…
Cancel
Save