diff --git a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro index b8c6bd5..f9747a2 100644 --- a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro +++ b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro @@ -9,6 +9,7 @@ contains(CONFIG, static_build){ !contains(CONFIG, staticlib){ CONFIG += dll DEFINES += QZINT_LIBRARY + } include(../../../common.pri) @@ -26,7 +27,15 @@ unix{ INCLUDEPATH += $$PWD/../backend DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$VERSION\\\" -TARGET = QtZint + +CONFIG(debug, debug|release) { + TARGET = QtZintd +} else { + TARGET = QtZint +} + + + !contains(DEFINES, NO_PNG) { SOURCES += $$PWD/../backend/png.c diff --git a/common.pri b/common.pri index a99ca12..6a8f275 100644 --- a/common.pri +++ b/common.pri @@ -62,7 +62,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 4 -LIMEREPORT_VERSION_RELEASE = 63 +LIMEREPORT_VERSION_RELEASE = 78 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro index b620055..71c0821 100644 --- a/demo_r1/demo_r1.pro +++ b/demo_r1/demo_r1.pro @@ -26,24 +26,37 @@ macx{ } unix:{ - LIBS += -L$${DEST_LIBS} -llimereport - !contains(CONFIG, static_build){ - contains(CONFIG,zint){ - LIBS += -L$${DEST_LIBS} -lQtZint - } + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -llimereportd + } else { + LIBS += -llimereport } - DESTDIR = $$DEST_DIR -# QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | - QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t) -linux{ - #Link share lib to ../lib rpath - QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN - QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib - QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib - QMAKE_LFLAGS_RPATH += #. .. ./libs -} - target.path = $${DEST_DIR} - INSTALLS = target + + !contains(CONFIG, static_build){ + contains(CONFIG,zint){ + LIBS += -L$${DEST_LIBS} + + CONFIG(debug, debug|release) { + LIBS += -lQtZintd + } else { + LIBS += -lQtZint + } + } + } + DESTDIR = $$DEST_DIR + # QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | + QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t) + + linux{ + #Link share lib to ../lib rpath + QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN + QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib + QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib + QMAKE_LFLAGS_RPATH += #. .. ./libs + } + target.path = $${DEST_DIR} + INSTALLS = target } win32 { @@ -56,11 +69,23 @@ win32 { QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t) !contains(CONFIG, static_build){ - contains(CONFIG,zint){ - LIBS += -L$${DEST_LIBS} -lQtZint - } + + contains(CONFIG,zint){ + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -lQtZintd + } else { + LIBS += -lQtZint + } + } } - LIBS += -L$${DEST_LIBS} -llimereport + + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -llimereportd + } else { + LIBS += -llimereport + } } diff --git a/demo_r2/demo_r2.pro b/demo_r2/demo_r2.pro index f327957..8ff5356 100644 --- a/demo_r2/demo_r2.pro +++ b/demo_r2/demo_r2.pro @@ -26,21 +26,31 @@ macx{ } unix:{ - LIBS += -L$${DEST_LIBS} -llimereport - !contains(CONFIG, static_build){ - contains(CONFIG,zint){ - LIBS += -L$${DEST_LIBS} -lQtZint - } + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -llimereportd + } else { + LIBS += -llimereport } + !contains(CONFIG, static_build){ + contains(CONFIG,zint){ + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -lQtZintd + } else { + LIBS += -lQtZint + } + } + } DESTDIR = $$DEST_DIR QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t) -linux{ - #Link share lib to ../lib rpath - QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN - QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib - QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib - QMAKE_LFLAGS_RPATH += #. .. ./libs -} + linux{ + #Link share lib to ../lib rpath + QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN + QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib + QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib + QMAKE_LFLAGS_RPATH += #. .. ./libs + } target.path = $${DEST_DIR} INSTALLS = target } @@ -53,12 +63,23 @@ win32 { DESTDIR = $$DEST_DIR RC_FILE += mainicon.rc !contains(CONFIG, static_build){ - contains(CONFIG,zint){ - LIBS += -L$${DEST_LIBS} -lQtZint - } - } - LIBS += -L$${DEST_LIBS} -llimereport + contains(CONFIG,zint){ + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -lQtZintd + } else { + LIBS += -lQtZint + } + } + } + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -llimereportd + } else { + LIBS += -llimereport + } + QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\\demo_reports\" $$escape_expand(\\n\\t) } diff --git a/designer/designer.pro b/designer/designer.pro index fef1c0f..68bf6b6 100644 --- a/designer/designer.pro +++ b/designer/designer.pro @@ -17,12 +17,22 @@ macx{ } unix:{ - LIBS += -L$${DEST_LIBS} -llimereport - !contains(CONFIG, static_build){ - contains(CONFIG,zint){ - LIBS += -L$${DEST_LIBS} -lQtZint - } + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -llimereportd + } else { + LIBS += -llimereport } + !contains(CONFIG, static_build){ + contains(CONFIG,zint){ + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -lQtZintd + } else { + LIBS += -lQtZint + } + } + } DESTDIR = $$DEST_DIR linux{ #Link share lib to ../lib rpath @@ -43,10 +53,21 @@ win32 { DESTDIR = $$DEST_DIR RC_FILE += mainicon.rc !contains(CONFIG, static_build){ - contains(CONFIG,zint){ - LIBS += -L$${DEST_LIBS} -lQtZint - } + contains(CONFIG,zint){ + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -lQtZintd + } else { + LIBS += -lQtZint + } + } + } + + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -llimereportd + } else { + LIBS += -llimereport } - LIBS += -L$${DEST_LIBS} -llimereport } diff --git a/limereport/items/lrimageitem.h b/limereport/items/lrimageitem.h index 18b236f..77ea8db 100644 --- a/limereport/items/lrimageitem.h +++ b/limereport/items/lrimageitem.h @@ -47,6 +47,7 @@ class ImageItem : public LimeReport::ItemDesignIntf Q_PROPERTY(bool keepAspectRatio READ keepAspectRatio WRITE setKeepAspectRatio) Q_PROPERTY(bool center READ center WRITE setCenter) Q_PROPERTY(QString resourcePath READ resourcePath WRITE setResourcePath) + Q_PROPERTY(bool watermark READ isWatermark WRITE setWatermark) public: enum Format { Binary = 0, diff --git a/limereport/items/lrsubitemparentpropitem.cpp b/limereport/items/lrsubitemparentpropitem.cpp index 1587bc9..b02cfa7 100644 --- a/limereport/items/lrsubitemparentpropitem.cpp +++ b/limereport/items/lrsubitemparentpropitem.cpp @@ -77,8 +77,8 @@ void LimeReport::ItemLocationPropItem::setPropertyEditorData(QWidget *propertyEd } void LimeReport::ItemLocationPropItem::setModelData(QWidget *propertyEditor, QAbstractItemModel *model, const QModelIndex &index){ - object()->setProperty(propertyName().toLatin1(),stringToLocation(qobject_cast(propertyEditor)->text())); model->setData(index,object()->property(propertyName().toLatin1())); + setValueToObject(propertyName(), propertyValue()); } QString LimeReport::ItemLocationPropItem::locationToString(LimeReport::ItemDesignIntf::LocationType location) const{ @@ -92,6 +92,5 @@ LimeReport::ItemDesignIntf::LocationType LimeReport::ItemLocationPropItem::strin void LimeReport::ItemLocationPropItem::slotLocationChanged(const QString &text){ if ( locationToString(object()->property(propertyName().toLatin1()).toInt())!=text){ object()->setProperty(propertyName().toLatin1(),stringToLocation(text)); - dynamic_cast(sender())->setTextValue(locationToString(object()->property(propertyName().toLatin1()).toInt())); } } diff --git a/limereport/items/lrtextitem.cpp b/limereport/items/lrtextitem.cpp index 8c01e87..15e5809 100644 --- a/limereport/items/lrtextitem.cpp +++ b/limereport/items/lrtextitem.cpp @@ -543,6 +543,14 @@ void TextItem::setTextLayoutDirection(const Qt::LayoutDirection &textLayoutDirec } } +void TextItem::setWatermark(bool watermark) +{ + if (watermark){ + setBackgroundMode(TransparentMode); + } + BaseDesignIntf::setWatermark(watermark); +} + QString TextItem::followTo() const { diff --git a/limereport/items/lrtextitem.h b/limereport/items/lrtextitem.h index f743d3d..5bc82fb 100644 --- a/limereport/items/lrtextitem.h +++ b/limereport/items/lrtextitem.h @@ -71,6 +71,7 @@ class TextItem : public LimeReport::ContentItemDesignIntf, IPageInit { Q_PROPERTY(BrushStyle backgroundBrushStyle READ backgroundBrushStyle WRITE setBackgroundBrushStyle) Q_PROPERTY(qreal textIndent READ textIndent WRITE setTextIndent) Q_PROPERTY(Qt::LayoutDirection textLayoutDirection READ textLayoutDirection WRITE setTextLayoutDirection) + Q_PROPERTY(bool watermark READ isWatermark WRITE setWatermark) public: enum AutoWidth{NoneAutoWidth,MaxWordLength,MaxStringLength}; @@ -163,6 +164,8 @@ public: void setTextIndent(const qreal &textIndent); Qt::LayoutDirection textLayoutDirection() const; void setTextLayoutDirection(const Qt::LayoutDirection &textLayoutDirection); + + void setWatermark(bool watermark); protected: void updateLayout(); diff --git a/limereport/limereport.pro b/limereport/limereport.pro index 91aab97..b05ac00 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -1,4 +1,13 @@ -TARGET = limereport +#TARGET = limereport + + +CONFIG(debug, debug|release) { + TARGET = limereportd +} else { + TARGET = limereport +} + + TEMPLATE = lib contains(CONFIG, static_build){ @@ -73,7 +82,14 @@ contains(CONFIG,zint){ message(zint) INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4 DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4 - LIBS += -L$${DEST_LIBS} -lQtZint + LIBS += -L$${DEST_LIBS} + + CONFIG(debug, debug|release) { + LIBS += -lQtZintd + } else { + LIBS += -lQtZint + } + } ####### diff --git a/limereport/lrbanddesignintf.cpp b/limereport/lrbanddesignintf.cpp index 6ca39be..4e3b5fc 100644 --- a/limereport/lrbanddesignintf.cpp +++ b/limereport/lrbanddesignintf.cpp @@ -182,14 +182,27 @@ QString BandDesignIntf::translateBandName(const BaseDesignIntf* item) const{ } } +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(); @@ -585,7 +598,7 @@ BaseDesignIntf *BandDesignIntf::cloneBottomPart(int height, QObject *owner, QGra BaseDesignIntf* tmpItem = item->cloneItem(item->itemMode(),bottomPart,bottomPart); tmpItem->setPos(tmpItem->pos().x(), (tmpItem->pos().y()-height)+borderLineSize()); } - else if ((item->geometry().top()geometry().bottom()>height)){ + else if ((item->geometry().top()<=height) && (item->geometry().bottom()>height)){ int sliceHeight = height-item->geometry().top(); if (item->isSplittable() && item->canBeSplitted(sliceHeight)) { BaseDesignIntf* tmpItem=item->cloneBottomPart(sliceHeight,bottomPart,bottomPart); @@ -597,7 +610,7 @@ BaseDesignIntf *BandDesignIntf::cloneBottomPart(int height, QObject *owner, QGra moveItemsDown(item->pos().y()+item->height(), sizeOffset + bottomOffset); } } else { - if ((item->geometry().bottom()-height)>height){ + if ((item->geometry().bottom()-height)>=height){ BaseDesignIntf* tmpItem = item->cloneItem(item->itemMode(),bottomPart,bottomPart); tmpItem->setPos(tmpItem->pos().x(),borderLineSize()); tmpItem->setHeight((this->height()-height)); diff --git a/limereport/lrbanddesignintf.h b/limereport/lrbanddesignintf.h index 5f56beb..7bf8401 100644 --- a/limereport/lrbanddesignintf.h +++ b/limereport/lrbanddesignintf.h @@ -105,6 +105,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; @@ -235,6 +237,8 @@ public: QColor alternateBackgroundColor() const; void setAlternateBackgroundColor(const QColor &alternateBackgroundColor); qreal bottomSpace() const; + void setBackgroundModeProperty(BGMode value); + void setBackgroundOpacity(int value); signals: void bandRendered(BandDesignIntf* band); protected: diff --git a/limereport/lrbasedesignintf.cpp b/limereport/lrbasedesignintf.cpp index bab44fa..61c7283 100644 --- a/limereport/lrbasedesignintf.cpp +++ b/limereport/lrbasedesignintf.cpp @@ -78,7 +78,8 @@ BaseDesignIntf::BaseDesignIntf(const QString &storageTypeName, QObject *owner, Q m_changingItemAlign(false), m_borderColor(Qt::black), m_reportSettings(0), - m_patternName("") + m_patternName(""), + m_watermark(false) { setGeometry(QRectF(0, 0, m_width, m_height)); if (BaseDesignIntf *item = dynamic_cast(parent)) { @@ -399,19 +400,21 @@ void BaseDesignIntf::prepareRect(QPainter *painter, const QStyleOptionGraphicsIt { painter->save(); + QRectF r = rect().adjusted(0, 0, borderLineSize(), borderLineSize()); QBrush brush(m_backgroundColor,static_cast(m_backgroundBrushStyle)); brush.setTransform(painter->worldTransform().inverted()); if (isSelected() && (opacity() == 100) && (m_BGMode!=TransparentMode)) { - painter->fillRect(rect(), brush); + painter->fillRect(r, brush); } else { if (m_BGMode == OpaqueMode) { - painter->setOpacity(qreal(m_opacity) / 100); - painter->fillRect(rect(), brush); + qreal o = (itemMode() & DesignMode) ? 0.5 : qreal(m_opacity) / 100; + painter->setOpacity(o); + painter->fillRect(r, brush); } else if (itemMode() & DesignMode){ painter->setOpacity(0.1); - painter->fillRect(rect(), QBrush(QPixmap(":/report/images/empty"))); + painter->fillRect(r, QBrush(QPixmap(":/report/images/empty"))); } } painter->restore(); @@ -701,6 +704,19 @@ void BaseDesignIntf::turnOnSelectionMarker(bool value) } } +bool BaseDesignIntf::isWatermark() const +{ + return m_watermark; +} + +void BaseDesignIntf::setWatermark(bool watermark) +{ + if (m_watermark != watermark){ + m_watermark = watermark; + notify("watermark",!watermark,watermark); + } +} + QString BaseDesignIntf::patternName() const { return (m_patternName.isEmpty()) ? objectName() : m_patternName; @@ -1153,6 +1169,7 @@ void BaseDesignIntf::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) void BaseDesignIntf::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { + if (!(flags() & QGraphicsItem::ItemIsSelectable)) return; PageDesignIntf* page = dynamic_cast(scene()); if (!page->selectedItems().contains(this)){ page->clearSelection(); diff --git a/limereport/lrbasedesignintf.h b/limereport/lrbasedesignintf.h index ecced96..904b64e 100644 --- a/limereport/lrbasedesignintf.h +++ b/limereport/lrbasedesignintf.h @@ -272,6 +272,8 @@ public: void setZValueProperty(qreal value); QString patternName() const; void setPatternName(const QString &patternName); + bool isWatermark() const; + virtual void setWatermark(bool watermark); Q_INVOKABLE QString setItemWidth(qreal width); Q_INVOKABLE QString setItemHeight(qreal height); @@ -396,6 +398,7 @@ private: QColor m_borderColor; ReportSettings* m_reportSettings; QString m_patternName; + bool m_watermark; signals: void geometryChanged(QObject* object, QRectF newGeometry, QRectF oldGeometry); void posChanged(QObject* object, QPointF newPos, QPointF oldPos); diff --git a/limereport/lrdatadesignintf.cpp b/limereport/lrdatadesignintf.cpp index 6cb5678..18e0d49 100644 --- a/limereport/lrdatadesignintf.cpp +++ b/limereport/lrdatadesignintf.cpp @@ -70,7 +70,7 @@ bool QueryHolder::runQuery(IDataSource::DatasourceMode mode) m_mode = mode; QSqlDatabase db = QSqlDatabase::database(m_connectionName); - QSqlQuery* query = new QSqlQuery(db); + QSqlQuery query(db); if (!db.isValid()) { setLastError(QObject::tr("Invalid connection! %1").arg(m_connectionName)); @@ -82,13 +82,12 @@ bool QueryHolder::runQuery(IDataSource::DatasourceMode mode) if (!m_prepared) return false; } - query->prepare(m_preparedSQL); - - fillParams(query); - query->exec(); + query.prepare(m_preparedSQL); + fillParams(&query); + query.exec(); QSqlQueryModel *model = new QSqlQueryModel; - model->setQuery(*query); + model->setQuery(query); while (model->canFetchMore()) model->fetchMore(); diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp index 5eb81e6..ed72282 100644 --- a/limereport/lrreportrender.cpp +++ b/limereport/lrreportrender.cpp @@ -640,7 +640,10 @@ void ReportRender::renderPageItems(PageItemDesignIntf* patternPage) m_renderPageItem->restoreLinks(); m_renderPageItem->updateSubItemsSize(FirstPass,m_datasources); foreach(BaseDesignIntf* item, pageItems){ - item->setZValue(item->zValue()-100000); + if (!item->isWatermark()) + item->setZValue(item->zValue()-100000); + else + item->setZValue(item->zValue()+100000); } } @@ -705,8 +708,8 @@ void ReportRender::renderGroupHeader(BandDesignIntf *parentBand, IDataSource* da foreach (BandDesignIntf* subBand, band->childrenByType(BandDesignIntf::GroupHeader)) { foreach(BandDesignIntf* footer, subBand->childrenByType(BandDesignIntf::GroupFooter)){ renderBand(footer, 0); - closeDataGroup(subBand); } + closeDataGroup(subBand); } foreach (BandDesignIntf* footer, band->childrenByType(BandDesignIntf::GroupFooter)) { diff --git a/limereport/objectinspector/lrobjectitemmodel.cpp b/limereport/objectinspector/lrobjectitemmodel.cpp index 080a7a2..71b3adb 100644 --- a/limereport/objectinspector/lrobjectitemmodel.cpp +++ b/limereport/objectinspector/lrobjectitemmodel.cpp @@ -134,6 +134,7 @@ void QObjectPropertyModel::translatePropertyName() tr("condition"); tr("groupFieldName"); tr("keepGroupTogether"); + tr("watermark"); } void QObjectPropertyModel::clearObjectsList() diff --git a/limereport/objectinspector/propertyItems/lrboolpropitem.cpp b/limereport/objectinspector/propertyItems/lrboolpropitem.cpp index c6c9f37..6e462a2 100644 --- a/limereport/objectinspector/propertyItems/lrboolpropitem.cpp +++ b/limereport/objectinspector/propertyItems/lrboolpropitem.cpp @@ -67,23 +67,39 @@ void BoolPropItem::setModelData(QWidget *propertyEditor, QAbstractItemModel *mod setValueToObject(propertyName(),propertyValue()); } +QPixmap BoolPropItem::getIndicatorImage(const StyleOptionViewItem &option){ + QStyleOptionButton so; + so.state = option.state; + if (!isValueReadonly()) + so.state = QStyle::State_Enabled; + else + so.state &= ~QStyle::State_Enabled; + so.state |= propertyValue().toBool() ? QStyle::State_On : QStyle::State_Off; + so.rect = QRect(0,0, + QApplication::style()->pixelMetric(QStyle::PM_IndicatorWidth), + QApplication::style()->pixelMetric(QStyle::PM_IndicatorHeight)); + + QPixmap pixmap(so.rect.width(),so.rect.height()); + pixmap.fill(Qt::transparent); + QPainter p(&pixmap); + option.widget->style()->drawPrimitive(QStyle::PE_IndicatorItemViewItemCheck,&so, &p); + return pixmap; +} + bool BoolPropItem::paint(QPainter *painter, const StyleOptionViewItem &option, const QModelIndex &index) { + + QStyle* style = option.widget ? option.widget->style() : QApplication::style(); + if (index.column()==1){ - QStyleOptionButton so; - int border = (option.rect.height() - QApplication::style()->pixelMetric(QStyle::PM_IndicatorWidth))/2; - so.rect = option.rect.adjusted(border,border,0,-border); - so.rect.setWidth(QApplication::style()->pixelMetric(QStyle::PM_IndicatorWidth)); - - if (!isValueReadonly()) - so.state = QStyle::State_Enabled; - else - so.state &= ~QStyle::State_Enabled; - - so.state |= propertyValue().toBool() ? QStyle::State_On : QStyle::State_Off; - - option.widget->style()->drawPrimitive(QStyle::PE_IndicatorCheckBox,&so,painter); - + int border = (option.rect.height() - style->pixelMetric(QStyle::PM_IndicatorWidth))/2; +// QStyleOptionButton so; +// so.rect = option.rect.adjusted(border,border,0,-border); +// so.rect.setWidth(style->pixelMetric(QStyle::PM_IndicatorWidth)); +// so.rect.setHeight(style->pixelMetric(QStyle::PM_IndicatorHeight)); +// so.state |= propertyValue().toBool() ? QStyle::State_On : QStyle::State_Off; +// style->drawPrimitive(QStyle::PE_IndicatorItemViewItemCheck,&so,painter); + painter->drawPixmap(option.rect.x()+border,option.rect.y()+border, getIndicatorImage(option)); return true; } else return false; } diff --git a/limereport/objectinspector/propertyItems/lrboolpropitem.h b/limereport/objectinspector/propertyItems/lrboolpropitem.h index 3407925..9331c3d 100644 --- a/limereport/objectinspector/propertyItems/lrboolpropitem.h +++ b/limereport/objectinspector/propertyItems/lrboolpropitem.h @@ -45,6 +45,8 @@ public: virtual void setPropertyEditorData(QWidget * propertyEditor, const QModelIndex &) const; virtual void setModelData(QWidget * propertyEditor, QAbstractItemModel * model, const QModelIndex & index); bool paint(QPainter *painter, const StyleOptionViewItem &option, const QModelIndex &index); +protected: + QPixmap getIndicatorImage(const StyleOptionViewItem &option); }; } // namespace LimeReport diff --git a/limereport/objectsbrowser/lrobjectbrowser.cpp b/limereport/objectsbrowser/lrobjectbrowser.cpp index e657a81..a5ee464 100644 --- a/limereport/objectsbrowser/lrobjectbrowser.cpp +++ b/limereport/objectsbrowser/lrobjectbrowser.cpp @@ -35,7 +35,8 @@ namespace LimeReport{ ObjectBrowser::ObjectBrowser(QWidget *parent) - :QWidget(parent), m_report(NULL), m_mainWindow(NULL), m_changingItemSelection(false) + :QWidget(parent), m_report(NULL), m_mainWindow(NULL), + m_changingItemSelection(false), m_movingItem(false) { QVBoxLayout *layout = new QVBoxLayout(this); setLayout(layout); @@ -86,6 +87,7 @@ void ObjectBrowser::slotClear() } void ObjectBrowser::fillNode(QTreeWidgetItem* parentNode, BaseDesignIntf* reportItem, BaseDesignIntf *ignoredItem){ + foreach (BaseDesignIntf* item, reportItem->childBaseItems()) { if (item != ignoredItem){ ObjectBrowserNode* treeItem = new ObjectBrowserNode(parentNode); @@ -93,11 +95,11 @@ void ObjectBrowser::fillNode(QTreeWidgetItem* parentNode, BaseDesignIntf* report treeItem->setObject(item); treeItem->setIcon(0,QIcon(":/items/"+extractClassName(item->metaObject()->className()))); connect(item, SIGNAL(propertyObjectNameChanged(QString,QString)), - this, SLOT(slotPropertyObjectNameChanged(QString,QString))); + this, SLOT(slotPropertyObjectNameChanged(QString,QString)), Qt::UniqueConnection); ItemDesignIntf* i = dynamic_cast(item); if (i){ connect(i, SIGNAL(itemLocationChanged(BaseDesignIntf*,BaseDesignIntf*)), - this, SLOT(slotItemParentChanged(BaseDesignIntf*,BaseDesignIntf*))); + this, SLOT(slotItemParentChanged(BaseDesignIntf*,BaseDesignIntf*)), Qt::UniqueConnection); } m_itemsMap.insert(item,treeItem); parentNode->addChild(treeItem); @@ -283,7 +285,9 @@ void ObjectBrowser::slotActivePageUpdated(LimeReport::PageDesignIntf *) buildTree(); } -void ObjectBrowser::slotItemParentChanged(BaseDesignIntf* item, BaseDesignIntf* parent) + + +void ObjectBrowser::moveItemNode(BaseDesignIntf* item, BaseDesignIntf* parent) { if (m_itemsMap.contains(item) && m_itemsMap.contains(parent)){ m_itemsMap.value(item)->parent()->removeChild(m_itemsMap.value(item)); @@ -293,7 +297,24 @@ void ObjectBrowser::slotItemParentChanged(BaseDesignIntf* item, BaseDesignIntf* item->setSelected(true); m_changingItemSelection = false; } +} +void ObjectBrowser::slotItemParentChanged(BaseDesignIntf* item, BaseDesignIntf* parent) +{ + if (!m_movingItem){ + m_movingItem = true; + moveItemNode(item, parent); + m_movingItem = false; + foreach(QObject* di, m_defferedItems){ + BaseDesignIntf* b = dynamic_cast(di); + if (b) + moveItemNode(b, parent); + } + m_defferedItems.clear(); + } else { + if (!m_defferedItems.contains(item)) + m_defferedItems.append(item); + } } void ObjectBrowserNode::setObject(QObject *value) diff --git a/limereport/objectsbrowser/lrobjectbrowser.h b/limereport/objectsbrowser/lrobjectbrowser.h index 4bdcb52..9d9482b 100644 --- a/limereport/objectsbrowser/lrobjectbrowser.h +++ b/limereport/objectsbrowser/lrobjectbrowser.h @@ -60,6 +60,7 @@ protected: void buildTree(BaseDesignIntf *ignoredItem = 0); void removeItem(BaseDesignIntf* item); void findAndRemove(QTreeWidgetItem *node, BaseDesignIntf *item); + void moveItemNode(BaseDesignIntf* item, BaseDesignIntf* parent); private slots: // void slotObjectNameChanged(const QString& objectName); void slotPropertyObjectNameChanged(const QString& oldName, const QString& newName); @@ -82,6 +83,8 @@ private: QTreeWidget* m_treeView; QMap m_itemsMap; bool m_changingItemSelection; + bool m_movingItem; + QList m_defferedItems; }; } //namespace LimeReport diff --git a/translations/limereport_ar.ts b/translations/limereport_ar.ts index 10ebbf1..add2edf 100644 --- a/translations/limereport_ar.ts +++ b/translations/limereport_ar.ts @@ -587,6 +587,10 @@ p, li { white-space: pre-wrap; } already exists! + + Port + + LimeReport::ContentItemDesignIntf @@ -1891,11 +1895,11 @@ p, li { white-space: pre-wrap; } Hide left panel - إخفاء المقطع الأيسر + إخفاء المقطع الأيسر Hide right panel - إخفاء المقطع الأيمن + إخفاء المقطع الأيمن Report Tools @@ -2065,6 +2069,14 @@ p, li { white-space: pre-wrap; } Report has been modified! Do you want save the report? + + Hide left panel | Alt+L + + + + Hide right panel | Alt+R + + LimeReport::ReportEnginePrivate @@ -2347,6 +2359,10 @@ This preview is no longer valid. GENERAL + + Seconds + + LimeReport::SettingDialog diff --git a/translations/limereport_es_ES.qm b/translations/limereport_es_ES.qm index eb316e3..a7fe947 100644 Binary files a/translations/limereport_es_ES.qm and b/translations/limereport_es_ES.qm differ diff --git a/translations/limereport_es_ES.ts b/translations/limereport_es_ES.ts index d5b0def..7aeadaf 100644 --- a/translations/limereport_es_ES.ts +++ b/translations/limereport_es_ES.ts @@ -454,6 +454,10 @@ p, li { white-space: pre-wrap; } already exists! + + Port + + LimeReport::ContentItemDesignIntf @@ -1710,14 +1714,6 @@ p, li { white-space: pre-wrap; } Horizontal layout - - Hide left panel - - - - Hide right panel - - Report Tools @@ -1866,6 +1862,14 @@ p, li { white-space: pre-wrap; } Report has been modified! Do you want save the report? + + Hide left panel | Alt+L + + + + Hide right panel | Alt+R + + LimeReport::ReportEnginePrivate @@ -2132,6 +2136,10 @@ This preview is no longer valid. GENERAL + + Seconds + + LimeReport::SettingDialog diff --git a/translations/limereport_fr.ts b/translations/limereport_fr.ts index f893b30..63df088 100644 --- a/translations/limereport_fr.ts +++ b/translations/limereport_fr.ts @@ -254,112 +254,112 @@ p, li { white-space: pre-wrap; } LimeReport::BandDesignIntf - + DataBand bande de données - + DataHeaderBand En-tête de données - + DataFooterBand Bande de pied de données - + ReportHeader En-tête du rapport - + ReportFooter Pied du rapport - + PageHeader En-tête de page - + PageFooter Pied de page - + SubDetailBand Bande de sous-détails - + SubDetailHeaderBand En-tête de sous-détails - + SubDetailFooterBand Pied de sous-détails - + GroupBandHeader Bande de groupe d'en-tête - + GroupBandFooter Bande de groupe de pieds - + TearOffBand Bande détachable - + connected to Connecté à - + Bring to top Placer au premier-plan - + Send to back Placer en arrière-plan - - + + Auto height Hauteur automatique - - + + Splittable Divisible - - + + Keep bottom space Garder l'espace inférieur - - + + Start from new page Démarrer depuis une nouvelle page - - + + Start new page Démarrer une nouvelle page @@ -367,37 +367,37 @@ p, li { white-space: pre-wrap; } LimeReport::BaseDesignIntf - + Copy Copier - + Cut Couper - + Paste Coller - + Bring to top Placer au premier-plan - + Send to back Placer en arrière-plan - + No borders Aucune bordure - + All borders Toutes les bordures @@ -405,8 +405,8 @@ p, li { white-space: pre-wrap; } LimeReport::ConnectionDesc - - + + defaultConnection Connexion par défaut @@ -430,57 +430,62 @@ p, li { white-space: pre-wrap; } Utiliser la connexion par défaut de l'application - + Driver Pilote - + Server Serveur - + + Port + + + + User Utilisateur - + Password Mot de passe - + Database Base de données - + ... - + Auto connect Connexion automatique - + Dont keep credentals in lrxml Ne pas enregistrer les informations personnelles - + Check connection Vérifier la connexion - + Cancel Annuler - + Ok @@ -511,7 +516,7 @@ p, li { white-space: pre-wrap; } existe déja! - + defaultConnection @@ -679,7 +684,7 @@ p, li { white-space: pre-wrap; } - + Datasource "%1" not found! Source de donnée "%1" introuvable! @@ -697,12 +702,12 @@ p, li { white-space: pre-wrap; } La source de donnée avec le nom "%1" existe déja! - + Database "%1" not found Base de données "%1 introuvable - + invalid connection Connexion invalide @@ -1196,12 +1201,12 @@ p, li { white-space: pre-wrap; } LimeReport::MasterDetailProxyModel - + Field: "%1" not found in "%2" child datasource Le champ: "%1"est introuvable dans la source de donnée enfant "%2" - + Field: "%1" not found in "%2" master datasource Le champ: "%1"est introuvable dans la source de donnée principale "%2" @@ -1209,7 +1214,7 @@ p, li { white-space: pre-wrap; } LimeReport::ModelToDataSource - + model is destroyed Le modèle a été supprimé @@ -1416,7 +1421,7 @@ p, li { white-space: pre-wrap; } LimeReport::ProxyHolder - + Datasource has been invalidated La source de donnée n'a pas été validée @@ -2087,14 +2092,22 @@ p, li { white-space: pre-wrap; } A propos - Hide left panel - Masquer le panneau de gauche + Masquer le panneau de gauche + + + Hide right panel + Masquer le panneau de droite + + + + Hide left panel | Alt+L + - Hide right panel - Masquer le panneau de droite + Hide right panel | Alt+R + @@ -2281,17 +2294,17 @@ p, li { white-space: pre-wrap; } Aperçu avant impression - + Error Erreur - + Report File Change Nom du fichier changé - + The report file "%1" has changed names or been deleted. This preview is no longer valid. @@ -2541,7 +2554,7 @@ Cet aperçu n'est plus valide. LimeReport::ScriptEngineContext - + Dialog with name: %1 can`t be created Le dialogue avec le nom "%1" ne peut pas être crée @@ -2549,89 +2562,96 @@ Cet aperçu n'est plus valide. LimeReport::ScriptEngineManager - + GROUP FUNCTIONS Fonctions de groupe - - - - - - - - + + + + + + + + Value Valeur - - + + BandName Nom de la bande - + Variable %1 not found Variable "%1" introuvable - + SYSTEM Système - - - + + + NUMBER Nombre - - - - + + + + + Format - + Precision Précision - - + + Locale Local - - - - - + + + + + + DATE&TIME DATE&HEURE - + + Seconds + + + + CurrencySymbol Symbolde de la monnaie - - - + + + GENERAL - - - + + + Name Nom @@ -2995,32 +3015,32 @@ Cet aperçu n'est plus valide. - + Invalid connection! %1 Connexion invalidé %1 - + Master datasource "%1" not found! Source de donnée principale "%1" introuvable! - + Master datasouce "%1" not found! Source de donnée principale "%1" introuvable! - + Child Enfant - + and child est enfant - + datasouce "%1" not found! Source de donnée "%1" introuvable! @@ -3136,7 +3156,7 @@ Cet aperçu n'est plus valide. L'objet avec le nom "%1" existe déja! - + Function %1 not found or have wrong arguments La fonction %1 est introuvable ou contient des paramètres incorrects diff --git a/translations/limereport_ru.qm b/translations/limereport_ru.qm index 6db7938..57a32c9 100644 Binary files a/translations/limereport_ru.qm and b/translations/limereport_ru.qm differ diff --git a/translations/limereport_ru.ts b/translations/limereport_ru.ts index d706b5f..7fbb600 100644 --- a/translations/limereport_ru.ts +++ b/translations/limereport_ru.ts @@ -456,6 +456,10 @@ p, li { white-space: pre-wrap; } already exists! уже существует! + + Port + + LimeReport::ContentItemDesignIntf @@ -1769,11 +1773,11 @@ p, li { white-space: pre-wrap; } Hide left panel - Спрятать левую панель + Спрятать левую панель Hide right panel - Спрятать правую панель + Спрятать правую панель Report Tools @@ -1951,6 +1955,14 @@ p, li { white-space: pre-wrap; } Report has been modified! Do you want save the report? Отчет был изменен! Хотите его сохранить? + + Hide left panel | Alt+L + + + + Hide right panel | Alt+R + + LimeReport::ReportEnginePrivate @@ -2225,6 +2237,10 @@ This preview is no longer valid. GENERAL ОБЩИЕ + + Seconds + + LimeReport::SettingDialog