Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
2d624e8b
Commit
2d624e8b
authored
Jan 11, 2011
by
dt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ProjectExplorer: Add option to not show output on run
Task-Nr: QTCREATORBUG-3433
parent
d244efe1
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
2 deletions
+16
-2
src/plugins/projectexplorer/projectexplorer.cpp
src/plugins/projectexplorer/projectexplorer.cpp
+3
-1
src/plugins/projectexplorer/projectexplorersettings.h
src/plugins/projectexplorer/projectexplorersettings.h
+4
-1
src/plugins/projectexplorer/projectexplorersettingspage.cpp
src/plugins/projectexplorer/projectexplorersettingspage.cpp
+2
-0
src/plugins/projectexplorer/projectexplorersettingspage.ui
src/plugins/projectexplorer/projectexplorersettingspage.ui
+7
-0
No files found.
src/plugins/projectexplorer/projectexplorer.cpp
View file @
2d624e8b
...
...
@@ -827,6 +827,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
d
->
m_projectExplorerSettings
.
deployBeforeRun
=
s
->
value
(
"ProjectExplorer/Settings/DeployBeforeRun"
,
true
).
toBool
();
d
->
m_projectExplorerSettings
.
saveBeforeBuild
=
s
->
value
(
"ProjectExplorer/Settings/SaveBeforeBuild"
,
false
).
toBool
();
d
->
m_projectExplorerSettings
.
showCompilerOutput
=
s
->
value
(
"ProjectExplorer/Settings/ShowCompilerOutput"
,
false
).
toBool
();
d
->
m_projectExplorerSettings
.
showRunOutput
=
s
->
value
(
"ProjectExplorer/Settings/ShowRunOutput"
,
true
).
toBool
();
d
->
m_projectExplorerSettings
.
cleanOldAppOutput
=
s
->
value
(
"ProjectExplorer/Settings/CleanOldAppOutput"
,
false
).
toBool
();
d
->
m_projectExplorerSettings
.
wrapAppOutput
=
s
->
value
(
"ProjectExplorer/Settings/WrapAppOutput"
,
true
).
toBool
();
d
->
m_projectExplorerSettings
.
useJom
=
s
->
value
(
"ProjectExplorer/Settings/UseJom"
,
true
).
toBool
();
...
...
@@ -1100,6 +1101,7 @@ void ProjectExplorerPlugin::savePersistentSettings()
s
->
setValue
(
"ProjectExplorer/Settings/DeployBeforeRun"
,
d
->
m_projectExplorerSettings
.
deployBeforeRun
);
s
->
setValue
(
"ProjectExplorer/Settings/SaveBeforeBuild"
,
d
->
m_projectExplorerSettings
.
saveBeforeBuild
);
s
->
setValue
(
"ProjectExplorer/Settings/ShowCompilerOutput"
,
d
->
m_projectExplorerSettings
.
showCompilerOutput
);
s
->
setValue
(
"ProjectExplorer/Settings/ShowRunOutput"
,
d
->
m_projectExplorerSettings
.
showRunOutput
);
s
->
setValue
(
"ProjectExplorer/Settings/CleanOldAppOutput"
,
d
->
m_projectExplorerSettings
.
cleanOldAppOutput
);
s
->
setValue
(
"ProjectExplorer/Settings/WrapAppOutput"
,
d
->
m_projectExplorerSettings
.
wrapAppOutput
);
s
->
setValue
(
"ProjectExplorer/Settings/UseJom"
,
d
->
m_projectExplorerSettings
.
useJom
);
...
...
@@ -1385,7 +1387,7 @@ void ProjectExplorerPlugin::executeRunConfiguration(RunConfiguration *runConfigu
void
ProjectExplorerPlugin
::
startRunControl
(
RunControl
*
runControl
,
const
QString
&
runMode
)
{
d
->
m_outputPane
->
createNewOutputWindow
(
runControl
);
if
(
runMode
==
ProjectExplorer
::
Constants
::
RUNMODE
)
if
(
runMode
==
ProjectExplorer
::
Constants
::
RUNMODE
&&
d
->
m_projectExplorerSettings
.
showRunOutput
)
d
->
m_outputPane
->
popup
(
false
);
d
->
m_outputPane
->
showTabFor
(
runControl
);
connect
(
runControl
,
SIGNAL
(
finished
()),
this
,
SLOT
(
runControlFinished
()));
...
...
src/plugins/projectexplorer/projectexplorersettings.h
View file @
2d624e8b
...
...
@@ -44,7 +44,8 @@ struct ProjectExplorerSettings
ProjectExplorerSettings
()
:
buildBeforeDeploy
(
true
),
deployBeforeRun
(
true
),
saveBeforeBuild
(
false
),
showCompilerOutput
(
false
),
cleanOldAppOutput
(
false
),
wrapAppOutput
(
true
),
useJom
(
true
),
showRunOutput
(
true
),
cleanOldAppOutput
(
false
),
wrapAppOutput
(
true
),
useJom
(
true
),
autorestoreLastSession
(
false
)
{
}
...
...
@@ -52,6 +53,7 @@ struct ProjectExplorerSettings
bool
deployBeforeRun
;
bool
saveBeforeBuild
;
bool
showCompilerOutput
;
bool
showRunOutput
;
bool
cleanOldAppOutput
;
bool
wrapAppOutput
;
bool
useJom
;
...
...
@@ -69,6 +71,7 @@ inline bool operator==(const ProjectExplorerSettings &p1, const ProjectExplorerS
&&
p1
.
deployBeforeRun
==
p2
.
deployBeforeRun
&&
p1
.
saveBeforeBuild
==
p2
.
saveBeforeBuild
&&
p1
.
showCompilerOutput
==
p2
.
showCompilerOutput
&&
p1
.
showRunOutput
==
p2
.
showRunOutput
&&
p1
.
cleanOldAppOutput
==
p2
.
cleanOldAppOutput
&&
p1
.
wrapAppOutput
==
p2
.
wrapAppOutput
&&
p1
.
useJom
==
p2
.
useJom
...
...
src/plugins/projectexplorer/projectexplorersettingspage.cpp
View file @
2d624e8b
...
...
@@ -73,6 +73,7 @@ ProjectExplorerSettings ProjectExplorerSettingsWidget::settings() const
pes
.
deployBeforeRun
=
m_ui
.
deployProjectBeforeRunCheckBox
->
isChecked
();
pes
.
saveBeforeBuild
=
m_ui
.
saveAllFilesCheckBox
->
isChecked
();
pes
.
showCompilerOutput
=
m_ui
.
showCompileOutputCheckBox
->
isChecked
();
pes
.
showRunOutput
=
m_ui
.
showRunOutputCheckBox
->
isChecked
();
pes
.
cleanOldAppOutput
=
m_ui
.
cleanOldAppOutputCheckBox
->
isChecked
();
pes
.
wrapAppOutput
=
m_ui
.
wrapAppOutputCheckBox
->
isChecked
();
pes
.
useJom
=
m_ui
.
jomCheckbox
->
isChecked
();
...
...
@@ -85,6 +86,7 @@ void ProjectExplorerSettingsWidget::setSettings(const ProjectExplorerSettings &
m_ui
.
deployProjectBeforeRunCheckBox
->
setChecked
(
pes
.
deployBeforeRun
);
m_ui
.
saveAllFilesCheckBox
->
setChecked
(
pes
.
saveBeforeBuild
);
m_ui
.
showCompileOutputCheckBox
->
setChecked
(
pes
.
showCompilerOutput
);
m_ui
.
showRunOutputCheckBox
->
setChecked
(
pes
.
showRunOutput
);
m_ui
.
cleanOldAppOutputCheckBox
->
setChecked
(
pes
.
cleanOldAppOutput
);
m_ui
.
wrapAppOutputCheckBox
->
setChecked
(
pes
.
wrapAppOutput
);
m_ui
.
jomCheckbox
->
setChecked
(
pes
.
useJom
);
...
...
src/plugins/projectexplorer/projectexplorersettingspage.ui
View file @
2d624e8b
...
...
@@ -83,6 +83,13 @@
</property>
</widget>
</item>
<item>
<widget
class=
"QCheckBox"
name=
"showRunOutputCheckBox"
>
<property
name=
"text"
>
<string>
Show run output on running
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QCheckBox"
name=
"cleanOldAppOutputCheckBox"
>
<property
name=
"text"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment