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

Merge remote branch 'origin/2.1'

Browse Source 
Conflicts:
    share/qtcreator/static.pro
    src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
    src/plugins/projectexplorer/outputwindow.cpp
This commit is contained in:
Oswald Buddenhagen
2010-11-15 19:03:18 +01:00
parent 146b2f0561 a783a90f4d
commit 04d4d309f7
29 changed files with 245 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/annotateditemdelegate.cpp
View File

@@ -76,8 +76,16 @@ void AnnotatedItemDelegate::paint(QPainter *painter,
style->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, painter, opt.widget);
style->drawControl(QStyle::CE_ItemViewItem, &opt, painter, opt.widget);
const QString &annotation = index.data(m_annotationRole).toString();
QString annotation = index.data(m_annotationRole).toString();
if (!annotation.isEmpty()) {
int newlinePos = annotation.indexOf(QLatin1Char('\n'));
if (newlinePos != -1) {
// print first line with '...' at end
const QChar ellipsisChar(0x2026);
annotation = annotation.left(newlinePos) + ellipsisChar;
}
QPalette disabled(opt.palette);
disabled.setCurrentColorGroup(QPalette::Disabled);