diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2010-09-14 11:37:54 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2010-09-14 17:26:49 +0200 |
| commit | 563c542a2f8fda500c9205298a781b2b0297da4d (patch) | |
| tree | 1c429b24c063729732b62aba3a1b3a0ba5c6bebd /src/plugins/projectexplorer/projectexplorersettings.h | |
| parent | b85597da6f120c339a6c6d47611992e44fe4b1bc (diff) | |
Add option to restore last session at startup
* Add an option to the session manager to restore the last
session on startup of creator.
* Align close button on session manager dialog with the other
buttons.
* Clean up handling of session restoration in the ProjectExplorer:
Move all the relevant code into determineSessionToRestoreAtStartup,
since most was there already.
Task-number: QTCREATORBUG-2324
Diffstat (limited to 'src/plugins/projectexplorer/projectexplorersettings.h')
| -rw-r--r-- | src/plugins/projectexplorer/projectexplorersettings.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/plugins/projectexplorer/projectexplorersettings.h b/src/plugins/projectexplorer/projectexplorersettings.h index 26b50a31e75..cff8b534dc1 100644 --- a/src/plugins/projectexplorer/projectexplorersettings.h +++ b/src/plugins/projectexplorer/projectexplorersettings.h @@ -37,9 +37,12 @@ namespace Internal { struct ProjectExplorerSettings { - ProjectExplorerSettings() : buildBeforeDeploy(true), deployBeforeRun(true), - saveBeforeBuild(false), showCompilerOutput(false), - cleanOldAppOutput(false), wrapAppOutput(true), useJom(true) {} + ProjectExplorerSettings() : + buildBeforeDeploy(true), deployBeforeRun(true), + saveBeforeBuild(false), showCompilerOutput(false), + cleanOldAppOutput(false), wrapAppOutput(true), useJom(true), + autorestoreLastSession(false) + { } bool buildBeforeDeploy; bool deployBeforeRun; @@ -48,6 +51,8 @@ struct ProjectExplorerSettings bool cleanOldAppOutput; bool wrapAppOutput; bool useJom; + bool autorestoreLastSession; // This option is set in the Session Manager! + // Add a UUid which is used to identify the development environment. // This is used to warn the user when he is trying to open a .user file that was created // somewhere else (which might lead to unexpected results). @@ -62,7 +67,8 @@ inline bool operator==(const ProjectExplorerSettings &p1, const ProjectExplorerS && p1.showCompilerOutput == p2.showCompilerOutput && p1.cleanOldAppOutput == p2.cleanOldAppOutput && p1.wrapAppOutput == p2.wrapAppOutput - && p1.useJom == p2.useJom; + && p1.useJom == p2.useJom + && p1.autorestoreLastSession == p2.autorestoreLastSession; } |