ProjectExplorer: Introduce dedicated output settings pages

One page for application output, one for build output. The respective
settings are now easier to find, and the general Build & Run settings
page looks more tidy now. We will also be able to link directly to the
respective settings from some button in the output panes in the future.
As a side effect, this patch also introduces a dedicated "word-wrap
output" setting for the compile output pane. It used to share this
setting with the application output pane, which was not obvious and
might not be what the user wants.

Change-Id: I5629363863ffe38e0faa006d361ec21484b593f4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

1 files changed, 19 insertions, 16 deletions

diff --git a/src/plugins/projectexplorer/projectexplorersettings.h b/src/plugins/projectexplorer/projectexplorersettings.h
index 13277e9736a..f0ddf6fa112 100644
--- a/src/plugins/projectexplorer/projectexplorersettings.h
+++ b/src/plugins/projectexplorer/projectexplorersettings.h
@@ -41,19 +41,11 @@ public:
     bool buildBeforeDeploy = true;
     bool deployBeforeRun = true;
     bool saveBeforeBuild = false;
-    bool showCompilerOutput = false;
-    bool showRunOutput = true;
-    bool showDebugOutput = false;
-    bool cleanOldAppOutput = false;
-    bool mergeStdErrAndStdOut = false;
-    bool wrapAppOutput = true;
     bool useJom = true;
     bool autorestoreLastSession = false; // This option is set in the Session Manager!
     bool prompToStopRunControl = false;
     bool automaticallyCreateRunConfigurations = true;
     bool addLibraryPathsToRunEnv = true;
-    int  maxAppOutputChars = Core::Constants::DEFAULT_MAX_CHAR_COUNT;
-    int  maxBuildOutputChars = Core::Constants::DEFAULT_MAX_CHAR_COUNT;
     StopBeforeBuild stopBeforeBuild = StopBeforeBuild::StopNone;
     QString buildDirectoryTemplate;
 
@@ -68,23 +60,34 @@ inline bool operator==(const ProjectExplorerSettings &p1, const ProjectExplorerS
     return p1.buildBeforeDeploy == p2.buildBeforeDeploy
             && p1.deployBeforeRun == p2.deployBeforeRun
             && p1.saveBeforeBuild == p2.saveBeforeBuild
-            && p1.showCompilerOutput == p2.showCompilerOutput
-            && p1.showRunOutput == p2.showRunOutput
-            && p1.showDebugOutput == p2.showDebugOutput
-            && p1.cleanOldAppOutput == p2.cleanOldAppOutput
-            && p1.mergeStdErrAndStdOut == p2.mergeStdErrAndStdOut
-            && p1.wrapAppOutput == p2.wrapAppOutput
             && p1.useJom == p2.useJom
             && p1.autorestoreLastSession == p2.autorestoreLastSession
             && p1.prompToStopRunControl == p2.prompToStopRunControl
             && p1.automaticallyCreateRunConfigurations == p2.automaticallyCreateRunConfigurations
             && p1.addLibraryPathsToRunEnv == p2.addLibraryPathsToRunEnv
-            && p1.maxAppOutputChars == p2.maxAppOutputChars
-            && p1.maxBuildOutputChars == p2.maxBuildOutputChars
             && p1.environmentId == p2.environmentId
             && p1.stopBeforeBuild == p2.stopBeforeBuild
             && p1.buildDirectoryTemplate == p2.buildDirectoryTemplate;
 }
 
+class AppOutputSettings
+{
+public:
+    bool popUpForRunOutput = true;
+    bool popUpForDebugOutput = false;
+    bool cleanOldOutput = false;
+    bool mergeChannels = false;
+    bool wrapOutput = false;
+    int maxCharCount = Core::Constants::DEFAULT_MAX_CHAR_COUNT;
+};
+
+class CompileOutputSettings
+{
+public:
+    bool popUp = false;
+    bool wrapOutput = false;
+    int maxCharCount = Core::Constants::DEFAULT_MAX_CHAR_COUNT;
+};
+
 } // namespace ProjectExplorer
 } // namespace Internal