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

debugger: grey out Locals&Expressions when not accessible

Browse Source 
Change-Id: I61489b9a5bf117be154ed6899beb3f8294247c9e
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-01-17 18:44:02 +01:00
committed by hjk
parent ad5c0edd33
commit 183769e7ef
4 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/debugger/watchhandler.cpp
View File

@@ -790,7 +790,7 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
static const QVariant red(QColor(200, 0, 0));
static const QVariant gray(QColor(140, 140, 140));
switch (idx.column()) {
case 1: return !data.valueEnabled ? gray
case 1: return (!data.valueEnabled || !m_handler->m_contentsValid) ? gray
: data.changed ? red : QVariant();
}
break;
@@ -907,6 +907,9 @@ bool WatchModel::setData(const QModelIndex &index, const QVariant &value, int ro
Qt::ItemFlags WatchModel::flags(const QModelIndex &idx) const
{
if (!m_handler->m_contentsValid)
return Qt::ItemFlags();
if (!idx.isValid())
return Qt::ItemFlags();
@@ -1253,6 +1256,9 @@ WatchHandler::WatchHandler(DebuggerEngine *engine)
m_watchers = new WatchModel(this, WatchersWatch);
m_tooltips = new WatchModel(this, TooltipsWatch);
m_contentsValid = false;
m_resetLocationScheduled = false;
connect(debuggerCore()->action(SortStructMembers), SIGNAL(valueChanged(QVariant)),
SLOT(reinsertAllData()));
connect(debuggerCore()->action(ShowStdNamespace), SIGNAL(valueChanged(QVariant)),
@@ -1275,6 +1281,10 @@ void WatchHandler::endCycle()
m_locals->endCycle();
m_watchers->endCycle();
m_tooltips->endCycle();
m_contentsValid = true;
m_resetLocationScheduled = false;
updateWatchersWindow();
}
@@ -1858,5 +1868,22 @@ void WatchHandler::editTypeFormats(bool includeLocals, const QByteArray &iname)
setTypeFormats(dlg.typeFormats());
}
void WatchHandler::scheduleResetLocation()
{
m_contentsValid = false;
m_resetLocationScheduled = true;
}
void WatchHandler::resetLocation()
{
if (m_resetLocationScheduled) {
m_resetLocationScheduled = false;
m_return->reset();
m_locals->reset();
m_watchers->reset();
m_tooltips->reset();
}
}
} // namespace Internal
} // namespace Debugger