forked from qt-creator/qt-creator
Git: Use Utils::Icon for IconItemDelegate constructor
Use our icon abstraction instead of file names, because themed icons are coming. Change-Id: I0f4e44caf96aeab0c354d2166b111d59b7b29149 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -31,6 +31,8 @@
|
||||
#include "../gitclient.h"
|
||||
#include "../gitconstants.h"
|
||||
|
||||
#include <utils/icon.h>
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QDir>
|
||||
#include <QPushButton>
|
||||
@@ -45,7 +47,7 @@ class PushItemDelegate : public IconItemDelegate
|
||||
{
|
||||
public:
|
||||
PushItemDelegate(LogChangeWidget *widget)
|
||||
: IconItemDelegate(widget, ":/git/images/arrowup.png")
|
||||
: IconItemDelegate(widget, Utils::Icon(":/git/images/arrowup.png"))
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -743,7 +743,7 @@ class RebaseItemDelegate : public IconItemDelegate
|
||||
{
|
||||
public:
|
||||
RebaseItemDelegate(LogChangeWidget *widget)
|
||||
: IconItemDelegate(widget, Utils::Icons::UNDO.imageFileName())
|
||||
: IconItemDelegate(widget, Utils::Icons::UNDO)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -279,9 +279,9 @@ int LogItemDelegate::currentRow() const
|
||||
return m_widget->commitIndex();
|
||||
}
|
||||
|
||||
IconItemDelegate::IconItemDelegate(LogChangeWidget *widget, const QString &icon)
|
||||
IconItemDelegate::IconItemDelegate(LogChangeWidget *widget, const Utils::Icon &icon)
|
||||
: LogItemDelegate(widget)
|
||||
, m_icon(icon)
|
||||
, m_icon(icon.icon())
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <utils/icon.h>
|
||||
#include <utils/itemviews.h>
|
||||
|
||||
#include <QDialog>
|
||||
@@ -114,7 +115,7 @@ private:
|
||||
class IconItemDelegate : public LogItemDelegate
|
||||
{
|
||||
public:
|
||||
IconItemDelegate(LogChangeWidget *widget, const QString &icon);
|
||||
IconItemDelegate(LogChangeWidget *widget, const Utils::Icon &icon);
|
||||
|
||||
virtual bool hasIcon(int row) const = 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user