From 777071c944996b78790c9119067ef0892a89aca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Wed, 16 Dec 2009 14:33:16 +0100
Subject: [PATCH] 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.
---
src/plugins/projectexplorer/outputwindow.cpp | 28 +++-----------------
src/plugins/projectexplorer/outputwindow.h | 1 -
2 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/src/plugins/projectexplorer/outputwindow.cpp b/src/plugins/projectexplorer/outputwindow.cpp
index 26767811989..3bd15355a26 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 e2175deaa5f..ce81025bdbd 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 *);
--
GitLab