aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>2009-12-16 14:33:16 +0100
committerThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>2009-12-16 14:33:16 +0100
commit777071c944996b78790c9119067ef0892a89aca7 (patch)
tree0df5fc44c75383331750b83ac4cb617bcf1eaad8 /src
parent68c1453bc76a272993ad3447ba03391d3d468f7a (diff)
Revert ""Grayout" the background of the output window on re-run configuration"
This reverts commit cdf2f70c60daa6c5ab8f6719c5de9d51a14ded84. This new feature didn't belong in 1.3. It will remain on master.
Diffstat (limited to 'src')
-rw-r--r--src/plugins/projectexplorer/outputwindow.cpp28
-rw-r--r--src/plugins/projectexplorer/outputwindow.h1
2 files changed, 3 insertions, 26 deletions
diff --git a/src/plugins/projectexplorer/outputwindow.cpp b/src/plugins/projectexplorer/outputwindow.cpp
index 2676781198..3bd15355a2 100644
--- a/src/plugins/projectexplorer/outputwindow.cpp
+++ b/src/plugins/projectexplorer/outputwindow.cpp
@@ -199,8 +199,7 @@ void OutputPane::createNewOutputWindow(RunControl *rc)
delete old;
m_outputWindows.remove(old);
OutputWindow *ow = static_cast<OutputWindow *>(m_tabWidget->widget(i));
- ow->grayOutOldContent();
- ow->verticalScrollBar()->setValue(ow->verticalScrollBar()->maximum());
+ ow->appendOutput("");//New line
m_outputWindows.insert(rc, ow);
found = true;
break;
@@ -243,14 +242,9 @@ void OutputPane::insertLine()
void OutputPane::reRunRunControl()
{
- int index = m_tabWidget->currentIndex();
- RunControl *rc = runControlForTab(index);
- if (rc->runConfiguration() && rc->runConfiguration()->project() != 0) {
- OutputWindow *ow = static_cast<OutputWindow *>(m_tabWidget->widget(index));
- ow->grayOutOldContent();
- ow->verticalScrollBar()->setValue(ow->verticalScrollBar()->maximum());
+ RunControl *rc = runControlForTab(m_tabWidget->currentIndex());
+ if (rc->runConfiguration()->project() != 0)
rc->start();
- }
}
void OutputPane::stopRunControl()
@@ -463,22 +457,6 @@ void OutputWindow::insertLine()
enableUndoRedo();
}
-void OutputWindow::grayOutOldContent()
-{
- QTextCursor cursor = textCursor();
- cursor.select(QTextCursor::Document);
- QTextBlockFormat tbf;
- const QColor bkgColor = palette().window().color();
- const QColor fgdColor = palette().windowText().color();
- tbf.setBackground(QColor((0.5 * bkgColor.red() + 0.5* fgdColor.red()),\
- (0.5 * bkgColor.green() + 0.5* fgdColor.green()),\
- (0.5 * bkgColor.blue() + 0.5* fgdColor.blue()) ));
- cursor.mergeBlockFormat(tbf);
-
- cursor.movePosition(QTextCursor::End);
- cursor.insertBlock(QTextBlockFormat());
-}
-
void OutputWindow::enableUndoRedo()
{
setMaximumBlockCount(0);
diff --git a/src/plugins/projectexplorer/outputwindow.h b/src/plugins/projectexplorer/outputwindow.h
index e2175deaa5..ce81025bdb 100644
--- a/src/plugins/projectexplorer/outputwindow.h
+++ b/src/plugins/projectexplorer/outputwindow.h
@@ -125,7 +125,6 @@ public:
void appendOutput(const QString &out);
void appendOutputInline(const QString &out);
void insertLine();
- void grayOutOldContent();
void showEvent(QShowEvent *);