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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdocconf
This commit is contained in:
con
2010-05-04 17:48:38 +02:00
parent 08f522d93c 5e3eb47e55
commit a186982d4f
9 changed files with 3448 additions and 1360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/git/branchmodel.cpp
View File

@@ -30,6 +30,7 @@
#include "branchmodel.h"
#include "gitclient.h"
#include <QtGui/QFont>
#include <QtCore/QDebug>
#include <QtCore/QRegExp>
#include <QtCore/QTimer>
@@ -229,14 +230,16 @@ QVariant LocalBranchModel::data(const QModelIndex &index, int role) const
return m_typeHere;
case Qt::ToolTipRole:
return m_typeHereToolTip;
case Qt::CheckStateRole:
return QVariant(false);
}
return QVariant();
}
if (role == Qt::CheckStateRole)
return index.row() == m_currentBranch ? Qt::Checked : Qt::Unchecked;
if (role == Qt::FontRole && index.row() == m_currentBranch) {
QFont font = RemoteBranchModel::data(index, role).value<QFont>();
font.setBold(true);
font.setUnderline(true);
return font;
}
return RemoteBranchModel::data(index, role);
}