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

Modify behaviour of sessions on the welcomescreen and tweak the session manager

Browse Source 
- List sessions by recent use instead of alphabetically
- Tweak the session manager. It is now a persistent dialog with only a close button
- Implement session renaming in the session manager
- Cleanups

Task-Number: QTCREATORBUG-1168
This commit is contained in:
Daniel Molkentin
2010-04-21 16:08:13 +02:00
parent 861981a39d
commit ee8caa5b7c
7 changed files with 148 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1029,24 +1029,17 @@ QString SessionManager::activeSession() const
return m_sessionName;
}
static bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
{
return s1.compare(s2, Qt::CaseInsensitive) < 0;
}
QStringList SessionManager::sessions() const
{
if (m_sessions.isEmpty()) {
// We are not initialized yet, so do that now
QDirIterator dirIter(QFileInfo(m_core->settings()->fileName()).path() + "/qtcreator/");
while (dirIter.hasNext()) {
dirIter.next();
const QFileInfo &fileInfo = dirIter.fileInfo();
if (fileInfo.suffix() == "qws" && fileInfo.completeBaseName() != "default")
QDir sessionDir(QFileInfo(m_core->settings()->fileName()).path()+ "/qtcreator/");
QList<QFileInfo> sessionFiles = sessionDir.entryInfoList(QStringList() << QLatin1String("*.qws"), QDir::NoFilter, QDir::Time);
Q_FOREACH(const QFileInfo& fileInfo, sessionFiles) {
if (fileInfo.completeBaseName() != "default")
m_sessions << fileInfo.completeBaseName();
}
m_sessions.prepend("default");
qSort(m_sessions.begin(), m_sessions.end(), caseInsensitiveLessThan);
}
return m_sessions;
}
@@ -1066,11 +1059,20 @@ bool SessionManager::createSession(const QString &session)
{
if (sessions().contains(session))
return false;
m_sessions.append(session);
qSort(m_sessions.begin(), m_sessions.end(), caseInsensitiveLessThan);
Q_ASSERT(m_sessions.size() > 0);
m_sessions.insert(1, session);
return true;
}
bool SessionManager::renameSession(const QString &original, const QString &newName)
{
if (!cloneSession(original, newName))
return false;
if (original == activeSession())
loadSession(newName);
return deleteSession(original);
}
bool SessionManager::deleteSession(const QString &session)
{
if (!m_sessions.contains(session))
@@ -1090,8 +1092,8 @@ bool SessionManager::cloneSession(const QString &original, const QString &clone)
QFile fi(sessionNameToFileName(original));
// If the file does not exist, we can still clone
if (!fi.exists() || fi.copy(sessionNameToFileName(clone))) {
m_sessions.append(clone);
qSort(m_sessions.begin(), m_sessions.end(), caseInsensitiveLessThan);
Q_ASSERT(m_sessions.size() > 0);
m_sessions.insert(1, clone);
return true;
}
return false;