mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-24 00:33:02 +03:00
Merge tag '1.7.14' into develop
Finish 1.7.14
This commit is contained in:
commit
7bef0e2c29
2
.github/workflows/cmake.yml
vendored
2
.github/workflows/cmake.yml
vendored
@ -145,7 +145,7 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
macos_version: [11, 12]
|
||||
macos_version: [12]
|
||||
qt_version: [5.15.2, 6.4.0]
|
||||
static: [ON, OFF]
|
||||
|
||||
|
@ -4,7 +4,7 @@ project(limereport)
|
||||
set(DEFAULT_ITEM_PADDING 0)
|
||||
set(LIMEREPORT_VERSION_MAJOR 1)
|
||||
set(LIMEREPORT_VERSION_MINOR 7)
|
||||
set(LIMEREPORT_VERSION_RELEASE 9)
|
||||
set(LIMEREPORT_VERSION_RELEASE 14)
|
||||
|
||||
option(ENABLE_ZINT "Enable libzint build for barcode support" OFF)
|
||||
option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF)
|
||||
|
@ -141,7 +141,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
|
||||
|
||||
LIMEREPORT_VERSION_MAJOR = 1
|
||||
LIMEREPORT_VERSION_MINOR = 7
|
||||
LIMEREPORT_VERSION_RELEASE = 9
|
||||
LIMEREPORT_VERSION_RELEASE = 14
|
||||
|
||||
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
||||
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
||||
|
@ -1524,6 +1524,10 @@ void BaseDesignIntf::setPossibleMoveFlags(int directionsFlags)
|
||||
m_possibleMoveDirectionFlags = directionsFlags;
|
||||
}
|
||||
|
||||
int BaseDesignIntf::marginSize() const {
|
||||
return m_margin + (m_reportSettings != 0 ? m_reportSettings->baseItemPadding() : 0);
|
||||
}
|
||||
|
||||
void BaseDesignIntf::setMarginSize(int value)
|
||||
{
|
||||
if (m_margin!=value){
|
||||
|
@ -295,9 +295,7 @@ public:
|
||||
int possibleMoveDirectionFlags() const;
|
||||
void setPossibleMoveFlags(int directionsFlags);
|
||||
|
||||
int marginSize() const {
|
||||
return m_margin + m_reportSettings != 0 ? m_reportSettings->baseItemPadding() : 0;
|
||||
}
|
||||
int marginSize() const;
|
||||
void setMarginSize(int value);
|
||||
|
||||
QString itemTypeName() const;
|
||||
|
@ -422,11 +422,6 @@ void PageDesignIntf::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
|
||||
m_selectionRect = 0;
|
||||
m_multiSelectStarted = false;
|
||||
}
|
||||
// if(m_infoPosRect)
|
||||
// {
|
||||
// delete m_infoPosRect;
|
||||
// m_infoPosRect = 0;
|
||||
// }
|
||||
QGraphicsScene::mouseReleaseEvent(event);
|
||||
}
|
||||
|
||||
@ -524,6 +519,7 @@ BaseDesignIntf *PageDesignIntf::addReportItem(const QString &itemType, QPointF p
|
||||
if (band) {
|
||||
BaseDesignIntf *reportItem = addReportItem(itemType, band, band);
|
||||
reportItem->setPos(placePosOnGrid(band->mapFromScene(pos)));
|
||||
reportItem->setReportSettings(m_reportSettings);
|
||||
reportItem->setSize(placeSizeOnGrid(size));
|
||||
reportItem->setUnitType(pageItem()->unitType());
|
||||
return reportItem;
|
||||
|
@ -248,16 +248,16 @@ ScriptHighlighter::ScriptHighlighter(QTextDocument* parent):
|
||||
}
|
||||
|
||||
if ( isColorDark(QPalette().window().color())){
|
||||
m_formats[NumberFormat].setForeground(Qt::darkBlue);
|
||||
m_formats[NumberFormat].setForeground(QColor("#45c6d1"));
|
||||
m_formats[StringFormat].setForeground(Qt::darkGreen);
|
||||
m_formats[KeywordFormat].setForeground(Qt::darkYellow);
|
||||
m_formats[CommentFormat].setForeground(Qt::darkGreen);
|
||||
m_formats[KeywordFormat].setForeground(QColor("#cd5125"));
|
||||
m_formats[CommentFormat].setForeground(QColor("#80807e"));
|
||||
m_formats[CommentFormat].setFontItalic(true);
|
||||
} else {
|
||||
m_formats[NumberFormat].setForeground(QColor("#ff6aad"));
|
||||
m_formats[StringFormat].setForeground(QColor("#b27f40"));
|
||||
m_formats[KeywordFormat].setForeground(QColor("#45c5d5"));
|
||||
m_formats[CommentFormat].setForeground(QColor("#a1a4a9"));
|
||||
m_formats[CommentFormat].setForeground(QColor("#a8aaab"));
|
||||
m_formats[CommentFormat].setFontItalic(true);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user