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

Sessions: prepare SessionModel for reuse

Browse Source 
refactoring redundant code without a behavior change

Change-Id: I264ee28ebf9b2d01899ece3f01c424032bda56ca
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tim Jenssen
2016-09-01 14:57:32 +02:00
parent dea29d5ed4
commit a53607a427
2 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/projectexplorer/sessionmodel.cpp
View File

@@ -122,23 +122,16 @@ void SessionModel::resetSessions()
endResetModel();
}
void SessionModel::newSession()
{
runNewSessionDialog("", &SessionManager::createSession);
}
void SessionModel::cloneSession(const QString &session)
{
SessionNameInputDialog newSessionInputDialog(SessionManager::sessions(), nullptr);
newSessionInputDialog.setWindowTitle(tr("New Session Name"));
newSessionInputDialog.setValue(session + QLatin1String(" (2)"));
if (newSessionInputDialog.exec() == QDialog::Accepted) {
QString newSession = newSessionInputDialog.value();
if (newSession.isEmpty() || SessionManager::sessions().contains(newSession))
return;
beginResetModel();
SessionManager::cloneSession(session, newSession);
endResetModel();
if (newSessionInputDialog.isSwitchToRequested())
SessionManager::loadSession(newSession);
}
runNewSessionDialog(session + " (2)", [session](const QString &newName) {
SessionManager::cloneSession(session, newName);
});
}
void SessionModel::deleteSession(const QString &session)
@@ -151,21 +144,34 @@ void SessionModel::deleteSession(const QString &session)
}
void SessionModel::renameSession(const QString &session)
{
runNewSessionDialog(session, [session](const QString &newName) {
SessionManager::cloneSession(session, newName);
});
}
void SessionModel::switchToSession(const QString &session)
{
SessionManager::loadSession(session);
emit sessionSwitched();
}
void SessionModel::runNewSessionDialog(const QString &suggestedName, std::function<void(const QString &)> createSession)
{
SessionNameInputDialog newSessionInputDialog(SessionManager::sessions(), nullptr);
newSessionInputDialog.setWindowTitle(tr("New Session Name"));
newSessionInputDialog.setValue(session);
newSessionInputDialog.setValue(suggestedName);
if (newSessionInputDialog.exec() == QDialog::Accepted) {
QString newSession = newSessionInputDialog.value();
if (newSession.isEmpty() || SessionManager::sessions().contains(newSession))
return;
beginResetModel();
SessionManager::renameSession(session, newSession);
createSession(newSession);
endResetModel();
if (newSessionInputDialog.isSwitchToRequested())
SessionManager::loadSession(newSession);
switchToSession(newSession);
}
}
} // namespace Internal