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

Git: Indicate affected commits for range operations

Browse Source 
* Reset: Strikethrough discarded commits
* Interactive Rebase: Mark included commits
* Push to Gerrit: Mark pushed commits

Change-Id: I5599a72055fd94b88c55b74b3a1116c07e35c113
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-10-16 06:04:37 +03:00
committed by Orgad Shaneh
parent 4e32babc44
commit 9ef8d71e2c
4 changed files with 149 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/plugins/git/logchangedialog.cpp
View File

@@ -33,6 +33,8 @@
#include <vcsbase/vcsbaseoutputwindow.h>
#include <utils/qtcassert.h>
#include <QTreeView>
#include <QLabel>
#include <QPushButton>
@@ -41,6 +43,7 @@
#include <QItemSelectionModel>
#include <QVBoxLayout>
#include <QComboBox>
#include <QPainter>
namespace Git {
namespace Internal {
@@ -55,6 +58,7 @@ enum Columns
LogChangeWidget::LogChangeWidget(QWidget *parent)
: QTreeView(parent)
, m_model(new QStandardItemModel(0, ColumnCount, this))
, m_hasCustomDelegate(false)
{
QStringList headers;
headers << tr("Sha1")<< tr("Subject");
@@ -104,6 +108,12 @@ QString LogChangeWidget::earliestCommit() const
return QString();
}
void LogChangeWidget::setItemDelegate(QAbstractItemDelegate *delegate)
{
QTreeView::setItemDelegate(delegate);
m_hasCustomDelegate = true;
}
void LogChangeWidget::emitDoubleClicked(const QModelIndex &index)
{
if (index.isValid()) {
@@ -113,6 +123,25 @@ void LogChangeWidget::emitDoubleClicked(const QModelIndex &index)
}
}
void LogChangeWidget::selectionChanged(const QItemSelection &selected,
const QItemSelection &deselected)
{
QTreeView::selectionChanged(selected, deselected);
if (!m_hasCustomDelegate)
return;
const QModelIndexList previousIndexes = deselected.indexes();
QTC_ASSERT(!previousIndexes.isEmpty(), return);
const QModelIndex current = currentIndex();
int row = current.row();
int previousRow = previousIndexes.first().row();
if (row < previousRow)
qSwap(row, previousRow);
for (int r = previousRow; r <= row; ++r) {
update(current.sibling(r, 0));
update(current.sibling(r, 1));
}
}
bool LogChangeWidget::populateLog(const QString &repository, const QString &commit, bool includeRemote)
{
const QString currentCommit = this->commit();
@@ -234,5 +263,40 @@ QString LogChangeDialog::resetFlag() const
return m_resetTypeComboBox->itemData(m_resetTypeComboBox->currentIndex()).toString();
}
LogChangeWidget *LogChangeDialog::widget() const
{
return m_widget;
}
LogItemDelegate::LogItemDelegate(LogChangeWidget *widget) : m_widget(widget)
{
m_widget->setItemDelegate(this);
}
int LogItemDelegate::currentRow() const
{
return m_widget->commitIndex();
}
IconItemDelegate::IconItemDelegate(LogChangeWidget *widget, const QString &icon)
: LogItemDelegate(widget)
, m_icon(icon)
{
}
void IconItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
const QModelIndex &index) const
{
QStyleOptionViewItem o = option;
if (index.column() == 0 && hasIcon(index.row())) {
const QSize size = option.decorationSize;
painter->save();
painter->drawPixmap(o.rect.x(), o.rect.y(), m_icon.pixmap(size.width(), size.height()));
painter->restore();
o.rect.translate(size.width(), 0);
}
QStyledItemDelegate::paint(painter, o, index);
}
} // namespace Internal
} // namespace Git