mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-23 08:29:07 +03:00
Code Activity

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alex
2016-07-07 23:52:51 +03:00
parent 826e62abe0 885cd91daa
commit 9243036750
17 changed files with 56 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
limereport/objectinspector/lrobjectinspectorwidget.cpp
View File

@@ -59,8 +59,8 @@ ObjectInspectorWidget::~ObjectInspectorWidget(){}
void ObjectInspectorWidget::drawRow(QPainter *painter, const QStyleOptionViewItem &options, const QModelIndex &index) const
{
ObjectPropItem *node = nodeFromIndex(index);
QStyleOptionViewItemV4 so = options;
bool alternate = so.features & QStyleOptionViewItemV4::Alternate;
StyleOptionViewItem so = options;
bool alternate = so.features & StyleOptionViewItem::Alternate;
if (node){
if ((!node->isHaveValue())){
const QColor c = options.palette.color(QPalette::Dark);

2
limereport/objectinspector/lrobjectpropitem.cpp
View File

@@ -177,7 +177,7 @@ void ObjectPropItem::updatePropertyValue()
m_model->setData(m_index,m_object->property(m_name.toLatin1()));
}
bool ObjectPropItem::paint(QPainter *, const QStyleOptionViewItemV4 &, const QModelIndex &)
bool ObjectPropItem::paint(QPainter *, const StyleOptionViewItem &, const QModelIndex &)
{
return false;
}

3
limereport/objectinspector/lrobjectpropitem.h
View File

@@ -36,7 +36,6 @@
#include <QMetaProperty>
#include <QAbstractItemModel>
#include <QDebug>
#include <QStyleOptionViewItemV4>
#include "lrattribsabstractfactory.h"
#include "lrsingleton.h"
@@ -70,7 +69,7 @@ namespace LimeReport{
virtual void setModelData(QWidget * /*editor*/, QAbstractItemModel * /*model*/, const QModelIndex &/*index*/){}
virtual void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &/*index*/) const;
virtual void updatePropertyValue();
virtual bool paint(QPainter *, const QStyleOptionViewItemV4 &, const QModelIndex &);
virtual bool paint(QPainter *, const StyleOptionViewItem &, const QModelIndex &);
ObjectPropItem* parent() const{ return m_parent;}
QObject* object() const{return m_object;}

4
limereport/objectinspector/lrpropertydelegate.cpp
View File

@@ -50,7 +50,7 @@ void LimeReport::PropertyDelegate::paint(QPainter *painter, const QStyleOptionVi
if (node){
if (!node->isHaveValue()){
if (index.column()==0) {
QStyleOptionViewItemV4 cellOpt = option;
StyleOptionViewItem cellOpt = option;
QTreeView const *tree = dynamic_cast<const QTreeView*>(cellOpt.widget);
QStyleOptionViewItem primitiveOpt = cellOpt;
primitiveOpt.rect.setWidth(tree->indentation());
@@ -82,7 +82,7 @@ void LimeReport::PropertyDelegate::paint(QPainter *painter, const QStyleOptionVi
painter->restore();
}
QStyleOptionViewItemV4 so = option;
StyleOptionViewItem so = option;
if ((node->isValueReadonly())&&(!node->isHaveChildren())) {
so.palette.setColor(QPalette::Text,so.palette.color(QPalette::Dark));
}

2
limereport/objectinspector/propertyItems/lrboolpropitem.cpp
View File

@@ -67,7 +67,7 @@ void BoolPropItem::setModelData(QWidget *propertyEditor, QAbstractItemModel *mod
setValueToObject(propertyName(),propertyValue());
}
bool BoolPropItem::paint(QPainter *painter, const QStyleOptionViewItemV4 &option, const QModelIndex &index)
bool BoolPropItem::paint(QPainter *painter, const StyleOptionViewItem &option, const QModelIndex &index)
{
if (index.column()==1){
QStyleOptionButton so;

2
limereport/objectinspector/propertyItems/lrboolpropitem.h
View File

@@ -44,7 +44,7 @@ public:
virtual QWidget* createProperyEditor(QWidget *parent) const;
virtual void setPropertyEditorData(QWidget * propertyEditor, const QModelIndex &) const;
virtual void setModelData(QWidget * propertyEditor, QAbstractItemModel * model, const QModelIndex & index);
bool paint(QPainter *painter, const QStyleOptionViewItemV4 &option, const QModelIndex &index);
bool paint(QPainter *painter, const StyleOptionViewItem &option, const QModelIndex &index);
};
} // namespace LimeReport

2
limereport/objectinspector/propertyItems/lrcolorpropitem.cpp
View File

@@ -54,7 +54,7 @@ void ColorPropItem::setModelData(QWidget *propertyEditor, QAbstractItemModel *mo
setValueToObject(propertyName(),propertyValue());
}
bool ColorPropItem::paint(QPainter *painter, const QStyleOptionViewItemV4 &option, const QModelIndex &index)
bool ColorPropItem::paint(QPainter *painter, const StyleOptionViewItem &option, const QModelIndex &index)
{
if (index.column()==1){
painter->save();

2
limereport/objectinspector/propertyItems/lrcolorpropitem.h
View File

@@ -44,7 +44,7 @@ public:
QWidget* createProperyEditor(QWidget *parent) const;
void setPropertyEditorData(QWidget *propertyEditor, const QModelIndex &) const;
void setModelData(QWidget *propertyEditor, QAbstractItemModel *model, const QModelIndex &index);
bool paint(QPainter *painter, const QStyleOptionViewItemV4 &option, const QModelIndex &index);
bool paint(QPainter *painter, const StyleOptionViewItem &option, const QModelIndex &index);
};
}