mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 00:33:02 +03:00
Code

Fix #40 Replace "QStyleOptionViewItemV4" with "QStyleOptionViewItem"

Browse Source
This commit is contained in:
Arin Alex 2016-07-07 23:48:03 +03:00
parent 692e941bbb
commit bf6adc13c3
12 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common.pri
View File

@ -68,6 +68,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
} }
lessThan(QT_MAJOR_VERSION, 5){ lessThan(QT_MAJOR_VERSION, 5){
DEFINES+=HAVE_QT4
CONFIG(uitools){ CONFIG(uitools){
message(uitools) message(uitools)
DEFINES += HAVE_UI_LOADER DEFINES += HAVE_UI_LOADER

8
include/lrglobal.h
View File

@ -32,6 +32,7 @@
#include "qglobal.h" #include "qglobal.h"
#include <stdexcept> #include <stdexcept>
#include <QString> #include <QString>
#include <QStyleOptionViewItem>
#if defined(LIMEREPORT_EXPORTS) #if defined(LIMEREPORT_EXPORTS)
# define LIMEREPORT_EXPORT Q_DECL_EXPORT # define LIMEREPORT_EXPORT Q_DECL_EXPORT
@ -94,6 +95,13 @@ namespace Const{
bool m_suppressAbsentFieldsAndVarsWarnings; bool m_suppressAbsentFieldsAndVarsWarnings;
}; };
#ifdef HAVE_QT4
typedef QStyleOptionViewItemV4 StyleOptionViewItem;
#else
typedef QStyleOptionViewItem StyleOptionViewItem;
#endif
} // namespace LimeReport } // namespace LimeReport

2
limereport/databrowser/lrdatabrowser.ui
View File

@ -35,7 +35,7 @@
<enum>QTabWidget::South</enum> <enum>QTabWidget::South</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">

8
limereport/lrglobal.h
View File

@ -32,6 +32,7 @@
#include "qglobal.h" #include "qglobal.h"
#include <stdexcept> #include <stdexcept>
#include <QString> #include <QString>
#include <QStyleOptionViewItem>
#if defined(LIMEREPORT_EXPORTS) #if defined(LIMEREPORT_EXPORTS)
# define LIMEREPORT_EXPORT Q_DECL_EXPORT # define LIMEREPORT_EXPORT Q_DECL_EXPORT
@ -94,6 +95,13 @@ namespace Const{
bool m_suppressAbsentFieldsAndVarsWarnings; bool m_suppressAbsentFieldsAndVarsWarnings;
}; };
#ifdef HAVE_QT4
typedef QStyleOptionViewItemV4 StyleOptionViewItem;
#else
typedef QStyleOptionViewItem StyleOptionViewItem;
#endif
} // namespace LimeReport } // namespace LimeReport

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 void ObjectInspectorWidget::drawRow(QPainter *painter, const QStyleOptionViewItem &options, const QModelIndex &index) const
{ {
ObjectPropItem *node = nodeFromIndex(index); ObjectPropItem *node = nodeFromIndex(index);
QStyleOptionViewItemV4 so = options; StyleOptionViewItem so = options;
bool alternate = so.features & QStyleOptionViewItemV4::Alternate; bool alternate = so.features & StyleOptionViewItem::Alternate;
if (node){ if (node){
if ((!node->isHaveValue())){ if ((!node->isHaveValue())){
const QColor c = options.palette.color(QPalette::Dark); 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())); 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; return false;
} }

3
limereport/objectinspector/lrobjectpropitem.h
View File

@ -36,7 +36,6 @@
#include <QMetaProperty> #include <QMetaProperty>
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QDebug> #include <QDebug>
#include <QStyleOptionViewItemV4>
#include "lrattribsabstractfactory.h" #include "lrattribsabstractfactory.h"
#include "lrsingleton.h" #include "lrsingleton.h"
@ -70,7 +69,7 @@ namespace LimeReport{
virtual void setModelData(QWidget * /*editor*/, QAbstractItemModel * /*model*/, const QModelIndex &/*index*/){} virtual void setModelData(QWidget * /*editor*/, QAbstractItemModel * /*model*/, const QModelIndex &/*index*/){}
virtual void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &/*index*/) const; virtual void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &/*index*/) const;
virtual void updatePropertyValue(); 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;} ObjectPropItem* parent() const{ return m_parent;}
QObject* object() const{return m_object;} 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){
if (!node->isHaveValue()){ if (!node->isHaveValue()){
if (index.column()==0) { if (index.column()==0) {
QStyleOptionViewItemV4 cellOpt = option; StyleOptionViewItem cellOpt = option;
QTreeView const *tree = dynamic_cast<const QTreeView*>(cellOpt.widget); QTreeView const *tree = dynamic_cast<const QTreeView*>(cellOpt.widget);
QStyleOptionViewItem primitiveOpt = cellOpt; QStyleOptionViewItem primitiveOpt = cellOpt;
primitiveOpt.rect.setWidth(tree->indentation()); primitiveOpt.rect.setWidth(tree->indentation());
@ -82,7 +82,7 @@ void LimeReport::PropertyDelegate::paint(QPainter *painter, const QStyleOptionVi
painter->restore(); painter->restore();
} }
QStyleOptionViewItemV4 so = option; StyleOptionViewItem so = option;
if ((node->isValueReadonly())&&(!node->isHaveChildren())) { if ((node->isValueReadonly())&&(!node->isHaveChildren())) {
so.palette.setColor(QPalette::Text,so.palette.color(QPalette::Dark)); 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()); 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){ if (index.column()==1){
QStyleOptionButton so; QStyleOptionButton so;

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

@ -44,7 +44,7 @@ public:
virtual QWidget* createProperyEditor(QWidget *parent) const; virtual QWidget* createProperyEditor(QWidget *parent) const;
virtual void setPropertyEditorData(QWidget * propertyEditor, const QModelIndex &) const; virtual void setPropertyEditorData(QWidget * propertyEditor, const QModelIndex &) const;
virtual void setModelData(QWidget * propertyEditor, QAbstractItemModel * model, const QModelIndex & index); 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 } // namespace LimeReport

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

@ -54,7 +54,7 @@ void ColorPropItem::setModelData(QWidget *propertyEditor, QAbstractItemModel *mo
setValueToObject(propertyName(),propertyValue()); 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){ if (index.column()==1){
painter->save(); painter->save();

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

@ -44,7 +44,7 @@ public:
QWidget* createProperyEditor(QWidget *parent) const; QWidget* createProperyEditor(QWidget *parent) const;
void setPropertyEditorData(QWidget *propertyEditor, const QModelIndex &) const; void setPropertyEditorData(QWidget *propertyEditor, const QModelIndex &) const;
void setModelData(QWidget *propertyEditor, QAbstractItemModel *model, const QModelIndex &index); 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);
}; };
} }