forked from qt-creator/qt-creator
SessionManager: emit sessionLoaded after actually changing activeSession
Also make use of that signal for the welcome page Task-Nr: QTCREATORBUG-4034
This commit is contained in:
@@ -331,6 +331,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
|
||||
this, SLOT(updateActions()));
|
||||
connect(d->m_session, SIGNAL(sessionLoaded()),
|
||||
this, SLOT(updateActions()));
|
||||
connect(d->m_session, SIGNAL(sessionLoaded()),
|
||||
this, SLOT(updateWelcomePage()));
|
||||
|
||||
d->m_proWindow = new ProjectWindow;
|
||||
|
||||
|
||||
@@ -215,6 +215,7 @@ private slots:
|
||||
void updateVariable(const QString &variable);
|
||||
|
||||
void publishProject();
|
||||
void updateWelcomePage();
|
||||
|
||||
#ifdef WITH_TESTS
|
||||
void testGccOutputParsers_data();
|
||||
@@ -252,7 +253,6 @@ private:
|
||||
IRunControlFactory *findRunControlFactory(RunConfiguration *config, const QString &mode);
|
||||
|
||||
void addToRecentProjects(const QString &fileName, const QString &displayName);
|
||||
void updateWelcomePage();
|
||||
|
||||
static ProjectExplorerPlugin *m_instance;
|
||||
ProjectExplorerPluginPrivate *d;
|
||||
|
||||
@@ -627,9 +627,6 @@ bool SessionManager::loadImpl(const QString &fileName)
|
||||
if (debug)
|
||||
qDebug() << "SessionManager - restoring session returned " << success;
|
||||
|
||||
if (success)
|
||||
emit sessionLoaded();
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
@@ -1031,6 +1028,7 @@ bool SessionManager::loadSession(const QString &session)
|
||||
if (QFileInfo(fileName).exists()) {
|
||||
if (loadImpl(fileName)) {
|
||||
updateName(session);
|
||||
emit sessionLoaded();
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
@@ -1038,6 +1036,7 @@ bool SessionManager::loadSession(const QString &session)
|
||||
if (!createImpl(sessionNameToFileName(session)))
|
||||
return false;
|
||||
updateName(session);
|
||||
emit sessionLoaded();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user