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

Fixes to edit format handling.

Browse Source 
- Close window after last tab has been removed.
- Remove type name from tab title (results in too-long tab titles
  for templates).

Change-Id: If4b55423261ed4992b8a7e983704006fdda86843
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2012-12-28 18:52:47 +01:00
committed by hjk
parent 03fd7266ac
commit 7bc0818d7a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1624,8 +1624,11 @@ void WatchHandler::removeSeparateWidget(QObject *o)
{ {
const int index = o && o->isWidgetType() && !m_separateWindow.isNull() ? const int index = o && o->isWidgetType() && !m_separateWindow.isNull() ?
indexOf(m_separateWindow, static_cast<QWidget *>(o)) : -1; indexOf(m_separateWindow, static_cast<QWidget *>(o)) : -1;
if (index != -1) if (index != -1) {
m_separateWindow->removeTab(index); m_separateWindow->removeTab(index);
if (!m_separateWindow->count())
m_separateWindow->hide();
}
} }
void WatchHandler::showSeparateWidget(QWidget *w) void WatchHandler::showSeparateWidget(QWidget *w)
@@ -1713,9 +1716,7 @@ void WatchHandler::showEditValue(const WatchData &data)
str = QString::fromLatin1(ba.constData(), ba.size()); str = QString::fromLatin1(ba.constData(), ba.size());
else if (data.editformat == DisplayUtf8String) else if (data.editformat == DisplayUtf8String)
str = QString::fromUtf8(ba.constData(), ba.size()); str = QString::fromUtf8(ba.constData(), ba.size());
t->setWindowTitle(QString::fromLatin1("%1 (%2)"). t->setWindowTitle(data.name);
arg(data.name, data.displayedType.isEmpty() ?
QLatin1String(data.type) : data.displayedType));
t->setText(str); t->setText(str);
showSeparateWidget(t); showSeparateWidget(t);
} }