mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 00:54:39 +03:00
Code

Merge tag '1.5.30' into develop

Browse Source 
Finish 1.5.30
This commit is contained in:
Arin Alexander 2020-01-31 20:03:41 +03:00
commit a1925345f4
15 changed files with 232 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
.travis.yml
View File

@ -498,7 +498,7 @@ matrix:
- make
- make check
- env: Qt5.12.3_Ubuntu_18.04
- env: Qt5.12.6_Ubuntu_18.04
os: linux
dist: bionic
language: cpp
@ -507,7 +507,7 @@ matrix:
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic'
- sourceline: 'ppa:beineri/opt-qt-5.12.6-bionic'
packages:
- qt512base
- qt512script
@ -521,7 +521,7 @@ matrix:
- make
- make check
- env: Qt5.12.3_Ubuntu_18.04
- env: Qt5.12.6_Ubuntu_18.04
os: linux
dist: bionic
language: cpp
@ -530,7 +530,7 @@ matrix:
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic'
- sourceline: 'ppa:beineri/opt-qt-5.12.6-bionic'
packages:
- qt512base
- qt512script
@ -544,5 +544,97 @@ matrix:
- make
- make check
- env: Qt5.13.2_Ubuntu_18.04
os: linux
dist: bionic
language: cpp
compiler: gcc
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt-5.13.2-bionic'
packages:
- qt513base
- qt513script
- qt513tools
- mesa-common-dev
- libgl1-mesa-dev
script:
- source /opt/qt513/bin/qt513-env.sh
- /opt/qt513/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.13.2_Ubuntu_18.04
os: linux
dist: bionic
language: cpp
compiler: clang
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt-5.13.2-bionic'
packages:
- qt513base
- qt513script
- qt513tools
- mesa-common-dev
- libgl1-mesa-dev
script:
- source /opt/qt513/bin/qt513-env.sh
- /opt/qt513/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.14.0_Ubuntu_18.04
os: linux
dist: bionic
language: cpp
compiler: gcc
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt-5.14.0-bionic'
packages:
- qt514base
- qt514script
- qt514tools
- mesa-common-dev
- libgl1-mesa-dev
script:
- source /opt/qt514/bin/qt514-env.sh
- /opt/qt514/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.14.0_Ubuntu_18.04
os: linux
dist: bionic
language: cpp
compiler: clang
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt-5.14.0-bionic'
packages:
- qt514base
- qt514script
- qt514tools
- mesa-common-dev
- libgl1-mesa-dev
script:
- source /opt/qt514/bin/qt514-env.sh
- /opt/qt514/bin/qmake -r limereport.pro
- make
- make check
notifications:
email: false

2
limereport/designer.pri
View File

@ -28,6 +28,7 @@ SOURCES += \
$$REPORT_PATH/objectinspector/propertyItems/lrgroupfieldpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrcontentpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrmarginpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrseriespropitem.cpp \
$$REPORT_PATH/objectinspector/editors/lrtextitempropertyeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrcomboboxeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrcheckboxeditor.cpp \
@ -71,6 +72,7 @@ HEADERS += \
$$REPORT_PATH/objectinspector/propertyItems/lrqrealpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrcolorpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrmarginpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrseriespropitem.h \
$$REPORT_PATH/objectinspector/editors/lrtextitempropertyeditor.h \
$$REPORT_PATH/objectinspector/editors/lrcomboboxeditor.h \
$$REPORT_PATH/objectinspector/editors/lrcheckboxeditor.h \

5
limereport/items/lrchartitem.h
View File

@ -117,7 +117,7 @@ class ChartItem : public LimeReport::ItemDesignIntf
Q_ENUMS(LegendAlign)
Q_ENUMS(TitleAlign)
Q_ENUMS(ChartType)
Q_PROPERTY(ACollectionProperty series READ fakeCollectionReader)
Q_PROPERTY(ACollectionProperty series READ fakeCollectionReader WRITE setSeries)
Q_PROPERTY(QString datasource READ datasource WRITE setDatasource)
Q_PROPERTY(QString chartTitle READ chartTitle WRITE setChartTitle)
Q_PROPERTY(bool drawLegendBorder READ drawLegendBorder WRITE setDrawLegendBorder)
@ -163,6 +163,7 @@ public:
QList<QString> labels() const;
void setLabels(const QList<QString> &labels);
QWidget* defaultEditor();
protected:
void paintChartTitle(QPainter* painter, QRectF titleRect);
@ -174,8 +175,8 @@ protected:
void collectionLoadFinished(const QString& collectionName){Q_UNUSED(collectionName)}
void updateItemSize(DataSourceManager *dataManager, RenderPass, int);
void fillLabels(IDataSource* dataSource);
QWidget* defaultEditor();
bool isNeedUpdateSize(RenderPass pass) const;
void setSeries(ACollectionProperty series){Q_UNUSED(series)}
private:
QList<SeriesItem*> m_series;
QString m_datasource;

2
limereport/items/lrchartitemeditor.cpp
View File

@ -189,9 +189,9 @@ void ChartItemEditor::on_splitter_splitterMoved(int , int )
#endif
}
void ChartItemEditor::on_pbOk_clicked()
{
emit editingFinished();
close();
}

4
limereport/items/lrchartitemeditor.h
View File

@ -25,6 +25,10 @@ public:
protected:
void resizeEvent(QResizeEvent *);
void moveEvent(QMoveEvent *);
signals:
void editingFinished();
private slots:
void on_splitter_splitterMoved(int, int);
void on_pbOk_clicked();

4
limereport/objectinspector/lrobjectinspectorwidget.cpp
View File

@ -101,7 +101,11 @@ void ObjectInspectorTreeView::mousePressEvent(QMouseEvent *event)
} else {
if ((index.column()==1)&&(!nodeFromIndex(index)->isHaveChildren())) {
setCurrentIndex(index);
Qt::ItemFlags flags = index.model()->flags(index);
if ( !(((flags & Qt::ItemIsEditable) == 0) || ((flags & Qt::ItemIsEnabled) == 0)) )
edit(index);
return ;
}
}

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

@ -48,7 +48,7 @@ QWidget* ImagePropItem::createProperyEditor(QWidget *parent) const
QString ImagePropItem::displayValue() const
{
return (propertyValue().isNull())?"":"Picture";
return (propertyValue().isNull()) ? "" : QObject::tr("image");
}
void ImagePropItem::setPropertyEditorData(QWidget *propertyEditor, const QModelIndex &) const

51
limereport/objectinspector/propertyItems/lrseriespropitem.cpp Normal file
View File

@ -0,0 +1,51 @@
#include "lrseriespropitem.h"
#include <QToolButton>
#include <lrchartitemeditor.h>
#include <lrpagedesignintf.h>
#include <lrreportengine_p.h>
namespace{
LimeReport::ObjectPropItem * createSeriesPropItem(
QObject *object, LimeReport::ObjectPropItem::ObjectsList* objects, const QString& name, const QString& displayName, const QVariant& data, LimeReport::ObjectPropItem* parent, bool readonly)
{
return new LimeReport::SeriesPropItem(object, objects, name, displayName, data, parent, readonly);
}
bool VARIABLE_IS_NOT_USED registredSeriesProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("series", "LimeReport::ChartItem"), QObject::tr("series"), createSeriesPropItem);
}
namespace LimeReport {
QWidget *SeriesPropItem::createProperyEditor(QWidget *parent) const
{
return new SeriesPropEditor(qobject_cast<ChartItem*>(object()), parent);
}
QString SeriesPropItem::displayValue() const
{
return QObject::tr("Series");
}
SeriesPropEditor::SeriesPropEditor(ChartItem *chart, QWidget *parent)
: QWidget(parent), m_button(new QPushButton(this)), m_chart(chart)
{
m_button->setText("...");
QHBoxLayout* layout = new QHBoxLayout(this);
layout->addWidget(m_button);
layout->setSpacing(1);
layout->setContentsMargins(1,0,1,1);
setLayout(layout);
setFocusProxy(m_button);
setAutoFillBackground(true);
connect(m_button,SIGNAL(clicked()),this,SLOT(slotButtonClicked()));
}
void SeriesPropEditor::slotButtonClicked()
{
m_chart->showEditorDialog();
emit editingFinished();
}
}

41
limereport/objectinspector/propertyItems/lrseriespropitem.h Normal file
View File

@ -0,0 +1,41 @@
#ifndef SERIESPROPITEM_H
#define SERIESPROPITEM_H
#include <QPushButton>
#include <QHBoxLayout>
#include <lrobjectpropitem.h>
#include <lrchartitem.h>
namespace LimeReport {
class SeriesPropEditor : public QWidget
{
Q_OBJECT
public:
SeriesPropEditor(ChartItem* chart, QWidget *parent = 0);
signals:
void editingFinished();
private slots:
void slotButtonClicked();
private:
QPushButton* m_button;
ChartItem* m_chart;
};
class SeriesPropItem : public LimeReport::ObjectPropItem{
Q_OBJECT
public:
SeriesPropItem():ObjectPropItem(){}
SeriesPropItem(QObject* object, ObjectsList* objects, const QString& name, const QString& displayName, const QVariant& value, ObjectPropItem* parent, bool readonly)
:ObjectPropItem(object, objects, name, displayName, value, parent, readonly){}
QWidget* createProperyEditor(QWidget *parent) const;
QString displayValue() const;
};
} // namespace LimeReport
#endif // SERIESPROPITEM_H

BIN
translations/limereport_ru.qm
View File

Binary file not shown.

16
translations/limereport_ru.ts
View File

@ -16,7 +16,7 @@
</message>
<message>
<source>Series</source>
<translation>Ряд</translation>
<translation>Ряды данных</translation>
</message>
<message>
<source>Add</source>
@ -1952,7 +1952,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<source>series</source>
<translation>Ряд данных</translation>
<translation>Ряды данных</translation>
</message>
<message>
<source>titleAlign</source>
@ -3225,5 +3225,17 @@ This preview is no longer valid.</source>
<source>&apos;&apos;</source>
<translation>&apos;&apos;</translation>
</message>
<message>
<source>image</source>
<translation>Изображение</translation>
</message>
<message>
<source>series</source>
<translation>Ряды данных</translation>
</message>
<message>
<source>Series</source>
<translation>Ряды данных</translation>
</message>
</context>
</TS>