Merge tag '1.5.30' into develop

Finish 1.5.30
2024-12-24 08:34:38 +03:00 · 2020-01-31 20:03:41 +03:00 · 2020-01-31 20:03:41 +03:00 · a1925345f4
commit a1925345f4
parent 3127daf3f9 31be3093d6
15 changed files with 232 additions and 25 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -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
@ -542,7 +542,99 @@ matrix:
          - source /opt/qt512/bin/qt512-env.sh
          - /opt/qt512/bin/qmake -r limereport.pro
          - make
-          - make check          
+          - 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
--- a/limereport/base/lrattribsabstractfactory.h
+++ b/limereport/base/lrattribsabstractfactory.h
@ -54,11 +54,11 @@ private:
    friend class Singleton< AttribsAbstractFactory< AbstractProduct,IdentifierType,ProductCreator,Attribs > >;
 public:
    bool registerCreator(const IdentifierType& id, Attribs attribs, ProductCreator creator){
-        return (m_factoryMap.insert(id,creator).value()==creator)&&
-               (m_attribsMap.insert(id,attribs).value()==attribs);
+        return (m_factoryMap.insert(id,creator).value() == creator) &&
+               (m_attribsMap.insert(id,attribs).value() == attribs);
    }
    bool unregisterCreator(const IdentifierType& id){
-        return (m_factoryMap.remove(id)==1)&&(m_attribsMap.remove(id)==1);
+        return (m_factoryMap.remove(id) == 1) && (m_attribsMap.remove(id) == 1);
    }
    ProductCreator objectCreator(const IdentifierType& id){
        if (m_factoryMap.contains(id)){
--- a/limereport/designer.pri
+++ b/limereport/designer.pri
@ -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 \
--- a/limereport/items/lrchartitem.cpp
+++ b/limereport/items/lrchartitem.cpp
@ -251,7 +251,7 @@ QWidget *ChartItem::defaultEditor()
    QSettings* l_settings = (page()->settings() != 0) ?
                                 page()->settings() :
                                 (page()->reportEditor()!=0) ? page()->reportEditor()->settings() : 0;
-    QWidget* editor = new ChartItemEditor(this,page(),l_settings);
+    QWidget* editor = new ChartItemEditor(this, page(), l_settings);
    editor->setAttribute(Qt::WA_DeleteOnClose);
    return editor;
 }
--- a/limereport/items/lrchartitem.h
+++ b/limereport/items/lrchartitem.h
@ -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);
@ -173,9 +174,9 @@ protected:
    QObject* elementAt(const QString& collectionName,int index);
    void collectionLoadFinished(const QString& collectionName){Q_UNUSED(collectionName)}    
    void updateItemSize(DataSourceManager *dataManager, RenderPass, int);
-    void fillLabels(IDataSource* dataSource);
-    QWidget* defaultEditor();
+    void fillLabels(IDataSource* dataSource);    
    bool isNeedUpdateSize(RenderPass pass) const;
+    void setSeries(ACollectionProperty series){Q_UNUSED(series)}
 private:
    QList<SeriesItem*> m_series;
    QString m_datasource;
--- a/limereport/items/lrchartitemeditor.cpp
+++ b/limereport/items/lrchartitemeditor.cpp
@ -189,9 +189,9 @@ void ChartItemEditor::on_splitter_splitterMoved(int , int )
 #endif
 }

-
 void ChartItemEditor::on_pbOk_clicked()
 {
+    emit editingFinished();
    close();
 }

--- a/limereport/items/lrchartitemeditor.h
+++ b/limereport/items/lrchartitemeditor.h
@ -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();
--- a/limereport/objectinspector/lrobjectinspectorwidget.cpp
+++ b/limereport/objectinspector/lrobjectinspectorwidget.cpp
@ -95,13 +95,17 @@ void ObjectInspectorTreeView::mousePressEvent(QMouseEvent *event)
    if ((event->button()==Qt::LeftButton)){
        QModelIndex index=indexAt(event->pos());
        if (index.isValid()){
-            if (event->pos().x()<indentation()) {
+            if (event->pos().x() < indentation()) {
                if (!nodeFromIndex(index)->isHaveValue())
                    setExpanded(index,!isExpanded(index));
            } else {
                if ((index.column()==1)&&(!nodeFromIndex(index)->isHaveChildren())) {
                    setCurrentIndex(index);
-                    edit(index);
+
+                    Qt::ItemFlags flags = index.model()->flags(index);
+                    if ( !(((flags & Qt::ItemIsEditable) == 0) || ((flags & Qt::ItemIsEnabled) == 0)) )
+                        edit(index);
+
                    return ;
                }
            }
--- a/limereport/objectinspector/lrobjectitemmodel.cpp
+++ b/limereport/objectinspector/lrobjectitemmodel.cpp
@ -363,14 +363,14 @@ QModelIndex QObjectPropertyModel::parent(const QModelIndex &child) const

 Qt::ItemFlags QObjectPropertyModel::flags(const QModelIndex &index) const
 {
-    if ((index.column()==1)&&(!nodeFromIndex(index)->isValueReadonly())) return Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsSelectable;
+    if ((index.column() == 1) && (!nodeFromIndex(index)->isValueReadonly())) return Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsSelectable;
    else return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
 }

 CreatePropItem QObjectPropertyModel::propertyItemCreator(QMetaProperty prop)
 {
-    CreatePropItem creator=0;
-    creator=ObjectPropFactory::instance().objectCreator(APropIdent(prop.name(),prop.enclosingMetaObject()->className()));
+    CreatePropItem creator = 0;
+    creator = ObjectPropFactory::instance().objectCreator(APropIdent(prop.name(),prop.enclosingMetaObject()->className()));
    if (!creator){
        if (prop.isFlagType()){
            creator=ObjectPropFactory::instance().objectCreator(APropIdent("flags",""));
@ -390,7 +390,7 @@ CreatePropItem QObjectPropertyModel::propertyItemCreator(QMetaProperty prop)
                return 0;
            }
        }
-        creator=ObjectPropFactory::instance().objectCreator(APropIdent(prop.typeName(),""));
+        creator = ObjectPropFactory::instance().objectCreator(APropIdent(prop.typeName(),""));
        if (!creator) {qDebug()<<"Editor for propperty name = \""<<prop.name()<<"\" & property type =\""<<prop.typeName()<<"\" not found!";}
    }
    return creator;
@ -409,7 +409,7 @@ ObjectPropItem * QObjectPropertyModel::createPropertyItem(QMetaProperty prop, QO
                QString(tr(prop.name())),
                object->property(prop.name()),
                parent,
-                !(prop.isWritable()&&prop.isDesignable())
+                !(prop.isWritable() && prop.isDesignable())
             );
    } else {
        propertyItem=new ObjectPropItem(
--- a/limereport/objectinspector/propertyItems/lrimagepropitem.cpp
+++ b/limereport/objectinspector/propertyItems/lrimagepropitem.cpp
@ -48,12 +48,12 @@ 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
 {
-    ImageEditor *editor =qobject_cast<ImageEditor*>(propertyEditor);
+    ImageEditor *editor = qobject_cast<ImageEditor*>(propertyEditor);
    editor->setImage(propertyValue().value<QImage>());
 }

--- a/limereport/objectinspector/propertyItems/lrseriespropitem.cpp
+++ b/limereport/objectinspector/propertyItems/lrseriespropitem.cpp
@ -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();
+}
+
+
+}
--- a/limereport/objectinspector/propertyItems/lrseriespropitem.h
+++ b/limereport/objectinspector/propertyItems/lrseriespropitem.h
@ -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
--- a/limereport/objectinspector/propertyItems/lrstringpropitem.cpp
+++ b/limereport/objectinspector/propertyItems/lrstringpropitem.cpp
@ -54,7 +54,7 @@ QWidget * StringPropItem::createProperyEditor(QWidget *parent) const

 void StringPropItem::setPropertyEditorData(QWidget *propertyEditor, const QModelIndex &) const
 {
-    ButtonLineEditor *editor =qobject_cast<ButtonLineEditor *>(propertyEditor);
+    ButtonLineEditor *editor = qobject_cast<ButtonLineEditor *>(propertyEditor);
    editor->setText(propertyValue().toString());
 }

--- a/translations/limereport_ru.qm
+++ b/translations/limereport_ru.qm
--- a/translations/limereport_ru.ts
+++ b/translations/limereport_ru.ts
@ -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>