diff --git a/common.pri b/common.pri index 8c0a66c..e8c91e0 100644 --- a/common.pri +++ b/common.pri @@ -97,7 +97,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 4 -LIMEREPORT_VERSION_RELEASE = 76 +LIMEREPORT_VERSION_RELEASE = 77 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" diff --git a/limereport/lrbanddesignintf.cpp b/limereport/lrbanddesignintf.cpp index c843fac..af9e324 100644 --- a/limereport/lrbanddesignintf.cpp +++ b/limereport/lrbanddesignintf.cpp @@ -191,14 +191,27 @@ void BandDesignIntf::copyBookmarks(BandDesignIntf* sourceBand) } } +void BandDesignIntf::setBackgroundModeProperty(BaseDesignIntf::BGMode value) +{ + if (value!=backgroundMode()){ + BaseDesignIntf::BGMode oldValue = backgroundMode(); + setBackgroundMode(value); + notify("backgroundMode",oldValue,value); + } +} + +void BandDesignIntf::setBackgroundOpacity(int value) +{ + if (opacity()!=value){ + int oldValue = opacity(); + setOpacity(value); + notify("backgroundOpacity",oldValue,value); + } +} + void BandDesignIntf::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - - if ( !(backgroundColor() == Qt::white && backgroundBrushStyle() == SolidPattern) ) { - QBrush brush(backgroundColor(), static_cast(backgroundBrushStyle())); - brush.setTransform(painter->worldTransform().inverted()); - painter->fillRect(rect(), brush); - } + prepareRect(painter, option, widget); if (itemMode() & DesignMode){ painter->save(); diff --git a/limereport/lrbanddesignintf.h b/limereport/lrbanddesignintf.h index 44def94..f3750b0 100644 --- a/limereport/lrbanddesignintf.h +++ b/limereport/lrbanddesignintf.h @@ -106,6 +106,8 @@ class BandDesignIntf : public ItemsContainerDesignInft Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor) Q_PROPERTY(BrushStyle backgroundBrushStyle READ backgroundBrushStyle WRITE setBackgroundBrushStyle) Q_PROPERTY(bool printIfEmpty READ printIfEmpty WRITE setPrintIfEmpty) + Q_PROPERTY(BGMode backgroundMode READ backgroundMode WRITE setBackgroundModeProperty) + Q_PROPERTY(int backgroundOpacity READ opacity WRITE setBackgroundOpacity) Q_ENUMS(BandColumnsLayoutType) friend class BandMarker; friend class BandNameLabel; @@ -243,6 +245,8 @@ public: void setUseAlternateBackgroundColor(bool useAlternateBackgroundColor); void replaceGroupsFunction(BandDesignIntf *band); qreal bottomSpace() const; + void setBackgroundModeProperty(BGMode value); + void setBackgroundOpacity(int value); void addBookmark(const QString& key, const QVariant& value){ m_bookmarks.insert(key, value);} QList bookmarks(){ return m_bookmarks.keys();}