feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Sessions: introduce a sessionDateTime

Browse Source 
This can show the last modified time of a session and
will be used in a next commit to make it more clear
when session was saved.

Change-Id: I9f73f62652efc9287563f833f25c49f79c39d936
Task-number: QTCREATORBUG-15790
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tim Jenssen
2016-09-23 19:14:50 +02:00
parent b8f198a985
commit 29f6f4f253
5 changed files with 60 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/projectexplorer/session.cpp
View File

@@ -99,6 +99,7 @@ public:
bool m_casadeSetActive = false;
mutable QStringList m_sessions;
mutable QHash<QString, QDateTime> m_sessionDateTimes;
mutable QHash<Project *, QStringList> m_projectFileCache;
@@ -466,7 +467,9 @@ bool SessionManager::save()
data.insert(QLatin1String("valueKeys"), keys);
bool result = d->m_writer->save(data, ICore::mainWindow());
if (!result) {
if (result) {
d->m_sessionDateTimes.insert(activeSession(), QDateTime::currentDateTime());
} else {
QMessageBox::warning(ICore::dialogParent(), tr("Error while saving session"),
tr("Could not save session to file %1").arg(d->m_writer->fileName().toUserOutput()));
}
@@ -750,14 +753,21 @@ QStringList SessionManager::sessions()
QDir sessionDir(ICore::userResourcePath());
QList<QFileInfo> sessionFiles = sessionDir.entryInfoList(QStringList() << QLatin1String("*.qws"), QDir::NoFilter, QDir::Time);
foreach (const QFileInfo &fileInfo, sessionFiles) {
if (fileInfo.completeBaseName() != QLatin1String("default"))
d->m_sessions << fileInfo.completeBaseName();
const QString &name = fileInfo.completeBaseName();
d->m_sessionDateTimes.insert(name, fileInfo.lastModified());
if (name != QLatin1String("default"))
d->m_sessions << name;
}
d->m_sessions.prepend(QLatin1String("default"));
}
return d->m_sessions;
}
QDateTime SessionManager::sessionDateTime(const QString &session)
{
return d->m_sessionDateTimes.value(session);
}
FileName SessionManager::sessionNameToFileName(const QString &session)
{
return FileName::fromString(ICore::userResourcePath() + QLatin1Char('/') + session + QLatin1String(".qws"));
@@ -820,6 +830,7 @@ bool SessionManager::cloneSession(const QString &original, const QString &clone)
// If the file does not exist, we can still clone
if (!fi.exists() || fi.copy(sessionNameToFileName(clone).toString())) {
d->m_sessions.insert(1, clone);
d->m_sessionDateTimes.insert(clone, QFileInfo(sessionNameToFileName(clone).toString()).lastModified());
return true;
}
return false;