feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: fix cursor busy state in output pane and in state DebuggerFinished.

Browse Source
This commit is contained in:
hjk
2010-07-21 12:18:50 +02:00
parent f292254967
commit fbd25fe84e
3 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/debuggeroutputwindow.cpp
View File

@@ -446,8 +446,8 @@ void DebuggerOutputWindow::clearContents()
void DebuggerOutputWindow::setCursor(const QCursor &cursor) void DebuggerOutputWindow::setCursor(const QCursor &cursor)
{ {
m_combinedText->setCursor(cursor); m_combinedText->viewport()->setCursor(cursor);
m_inputText->setCursor(cursor); m_inputText->viewport()->setCursor(cursor);
QWidget::setCursor(cursor); QWidget::setCursor(cursor);
} }

3
src/plugins/debugger/debuggeroutputwindow.h
View File

@@ -33,8 +33,9 @@
#include <QtGui/QWidget> #include <QtGui/QWidget>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QPlainTextEdit; class QCursor;
class QLineEdit; class QLineEdit;
class QPlainTextEdit;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Debugger { namespace Debugger {

20
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -1269,7 +1269,6 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
localsAndWatchers->addWidget(m_localsWindow); localsAndWatchers->addWidget(m_localsWindow);
localsAndWatchers->addWidget(m_returnWindow); localsAndWatchers->addWidget(m_returnWindow);
localsAndWatchers->addWidget(m_watchersWindow); localsAndWatchers->addWidget(m_watchersWindow);
//localsAndWatchers->addWidget(m_tooltipWindow);
localsAndWatchers->setStretchFactor(0, 3); localsAndWatchers->setStretchFactor(0, 3);
localsAndWatchers->setStretchFactor(1, 1); localsAndWatchers->setStretchFactor(1, 1);
localsAndWatchers->setStretchFactor(2, 1); localsAndWatchers->setStretchFactor(2, 1);
@@ -2028,33 +2027,19 @@ void DebuggerPluginPrivate::setBusyCursor(bool busy)
//STATE_DEBUG("BUSY FROM: " << m_busy << " TO: " << busy); //STATE_DEBUG("BUSY FROM: " << m_busy << " TO: " << busy);
if (busy == m_busy) if (busy == m_busy)
return; return;
m_busy = busy; m_busy = busy;
QCursor cursor(busy ? Qt::BusyCursor : Qt::ArrowCursor); QCursor cursor(busy ? Qt::BusyCursor : Qt::ArrowCursor);
m_breakWindow->setCursor(cursor); m_breakWindow->setCursor(cursor);
m_returnWindow->setCursor(cursor);
m_localsWindow->setCursor(cursor); m_localsWindow->setCursor(cursor);
m_modulesWindow->setCursor(cursor); m_modulesWindow->setCursor(cursor);
m_outputWindow->setCursor(cursor); m_outputWindow->setCursor(cursor);
m_registerWindow->setCursor(cursor); m_registerWindow->setCursor(cursor);
m_stackWindow->setCursor(cursor);
m_sourceFilesWindow->setCursor(cursor);
m_threadsWindow->setCursor(cursor);
//m_tooltipWindow->setCursor(cursor);
m_watchersWindow->setCursor(cursor);
m_breakWindow->setCursor(cursor);
m_returnWindow->setCursor(cursor); m_returnWindow->setCursor(cursor);
m_localsWindow->setCursor(cursor);
m_modulesWindow->setCursor(cursor);
m_outputWindow->setCursor(cursor);
m_registerWindow->setCursor(cursor);
m_stackWindow->setCursor(cursor);
m_sourceFilesWindow->setCursor(cursor); m_sourceFilesWindow->setCursor(cursor);
m_stackWindow->setCursor(cursor);
m_threadsWindow->setCursor(cursor); m_threadsWindow->setCursor(cursor);
//m_tooltipWindow->setCursor(cursor);
m_watchersWindow->setCursor(cursor); m_watchersWindow->setCursor(cursor);
m_snapshotWindow->setCursor(cursor);
} }
void DebuggerPluginPrivate::setSimpleDockWidgetArrangement(const QString &activeLanguage) void DebuggerPluginPrivate::setSimpleDockWidgetArrangement(const QString &activeLanguage)
@@ -2260,6 +2245,7 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
const bool notbusy = m_state == InferiorStopOk const bool notbusy = m_state == InferiorStopOk
|| m_state == DebuggerNotReady || m_state == DebuggerNotReady
|| m_state == DebuggerFinished
|| m_state == InferiorUnrunnable; || m_state == InferiorUnrunnable;
setBusyCursor(!notbusy); setBusyCursor(!notbusy);