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

2
limereport/databrowser/lrdatabrowser.ui
View File

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

8
limereport/lrdatadesignintf.cpp
View File

@@ -158,6 +158,7 @@ void QueryHolder::fillParams(QSqlQuery *query)
void QueryHolder::extractParams()
{
m_preparedSQL = replaceVariables(m_queryText);
m_prepared = true;
}
QString QueryHolder::replaceVariables(QString query)
@@ -195,6 +196,11 @@ QString QueryHolder::queryText()
void QueryHolder::setQueryText(QString queryText)
{
m_queryText=queryText;
m_prepared = false;
if (m_query) {
delete m_query;
m_query = 0;
}
}
IDataSource* QueryHolder::dataSource(IDataSource::DatasourceMode mode)
@@ -364,7 +370,7 @@ void ConnectionDesc::setName(const QString &value)
}
QueryDesc::QueryDesc(QString queryName, QString queryText, QString connection)
:m_queryName(queryName), m_query(queryText), m_connectionName(connection)
:m_queryName(queryName), m_queryText(queryText), m_connectionName(connection)
{}
SubQueryHolder::SubQueryHolder(QString queryText, QString connectionName, QString masterDatasource, DataSourceManager* dataManager)

8
limereport/lrdatadesignintf.h
View File

@@ -159,13 +159,15 @@ public:
explicit QueryDesc(QObject* parent=0):QObject(parent){}
void setQueryName(QString value){m_queryName=value;}
QString queryName(){return m_queryName;}
void setQueryText(QString value){m_query=value;}
QString queryText(){return m_query;}
void setQueryText(QString value){m_queryText=value; emit queryTextChanged(m_queryName, m_queryText);}
QString queryText(){return m_queryText;}
void setConnectionName(QString value){m_connectionName=value;}
QString connectionName(){return m_connectionName;}
signals:
void queryTextChanged(const QString& queryName, const QString& queryText);
private:
QString m_queryName;
QString m_query;
QString m_queryText;
QString m_connectionName;
};

20
limereport/lrdatasourcemanager.cpp
View File

@@ -620,13 +620,7 @@ bool DataSourceManager::checkConnectionDesc(ConnectionDesc *connection)
return false;
}
void DataSourceManager::addQueryDesc(QueryDesc *query)
{
m_queries.append(query);
addQuery(query->queryName(), query->queryText(), query->connectionName());
}
void DataSourceManager::putHolder(QString name, IDataSourceHolder *dataSource)
void DataSourceManager::putHolder(const QString& name, IDataSourceHolder *dataSource)
{
if (!m_datasources.contains(name.toLower())){
m_datasources.insert(
@@ -640,6 +634,8 @@ void DataSourceManager::putQueryDesc(QueryDesc* queryDesc)
{
if (!containsDatasource(queryDesc->queryName())){
m_queries.append(queryDesc);
connect(queryDesc, SIGNAL(queryTextChanged(QString,QString)),
this, SLOT(slotQueryTextChanged(QString,QString)));
} else throw ReportError(tr("datasource with name \"%1\" already exists !").arg(queryDesc->queryName()));
}
@@ -647,6 +643,8 @@ void DataSourceManager::putSubQueryDesc(SubQueryDesc *subQueryDesc)
{
if (!containsDatasource(subQueryDesc->queryName())){
m_subqueries.append(subQueryDesc);
connect(subQueryDesc, SIGNAL(queryTextChanged(QString,QString)),
this, SLOT(slotQueryTextChanged(QString,QString)));
} else throw ReportError(tr("datasource with name \"%1\" already exists !").arg(subQueryDesc->queryName()));
}
@@ -1058,6 +1056,14 @@ void DataSourceManager::slotConnectionRenamed(const QString &oldName, const QStr
}
}
void DataSourceManager::slotQueryTextChanged(const QString &queryName, const QString &queryText)
{
QueryHolder* holder = dynamic_cast<QueryHolder*>(m_datasources.value(queryName));
if (holder){
holder->setQueryText(queryText);
}
}
void DataSourceManager::clear(ClearMethod method)
{
DataSourcesMap::iterator dit;

4
limereport/lrdatasourcemanager.h
View File

@@ -195,8 +195,7 @@ signals:
void cleared();
void datasourcesChanged();
protected:
void addQueryDesc(QueryDesc *);
void putHolder(QString name, LimeReport::IDataSourceHolder* dataSource);
void putHolder(const QString& name, LimeReport::IDataSourceHolder* dataSource);
void putQueryDesc(QueryDesc *queryDesc);
void putSubQueryDesc(SubQueryDesc *subQueryDesc);
void putProxyDesc(ProxyDesc *proxyDesc);
@@ -217,6 +216,7 @@ protected:
private slots:
void slotConnectionRenamed(const QString& oldName,const QString& newName);
void slotQueryTextChanged(const QString& queryName, const QString& queryText);
private:
explicit DataSourceManager(QObject *parent = 0);
Q_DISABLE_COPY(DataSourceManager)

8
limereport/lrglobal.h
View File

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