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.7.14' into develop

Browse Source 
Finish 1.7.14
This commit is contained in:
Arin Alex 2024-07-31 20:04:48 +03:00
commit 7bef0e2c29
7 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/cmake.yml vendored
View File

@ -145,7 +145,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
macos_version: [11, 12] macos_version: [12]
qt_version: [5.15.2, 6.4.0] qt_version: [5.15.2, 6.4.0]
static: [ON, OFF] static: [ON, OFF]

2
CMakeLists.txt
View File

@ -4,7 +4,7 @@ project(limereport)
set(DEFAULT_ITEM_PADDING 0) set(DEFAULT_ITEM_PADDING 0)
set(LIMEREPORT_VERSION_MAJOR 1) set(LIMEREPORT_VERSION_MAJOR 1)
set(LIMEREPORT_VERSION_MINOR 7) 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(ENABLE_ZINT "Enable libzint build for barcode support" OFF)
option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF) option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF)

2
common.pri
View File

@ -141,7 +141,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 7 LIMEREPORT_VERSION_MINOR = 7
LIMEREPORT_VERSION_RELEASE = 9 LIMEREPORT_VERSION_RELEASE = 14
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

4
limereport/lrbasedesignintf.cpp
View File

@ -1524,6 +1524,10 @@ void BaseDesignIntf::setPossibleMoveFlags(int directionsFlags)
m_possibleMoveDirectionFlags = directionsFlags; m_possibleMoveDirectionFlags = directionsFlags;
} }
int BaseDesignIntf::marginSize() const {
return m_margin + (m_reportSettings != 0 ? m_reportSettings->baseItemPadding() : 0);
}
void BaseDesignIntf::setMarginSize(int value) void BaseDesignIntf::setMarginSize(int value)
{ {
if (m_margin!=value){ if (m_margin!=value){

4
limereport/lrbasedesignintf.h
View File

@ -295,9 +295,7 @@ public:
int possibleMoveDirectionFlags() const; int possibleMoveDirectionFlags() const;
void setPossibleMoveFlags(int directionsFlags); void setPossibleMoveFlags(int directionsFlags);
int marginSize() const { int marginSize() const;
return m_margin + m_reportSettings != 0 ? m_reportSettings->baseItemPadding() : 0;
}
void setMarginSize(int value); void setMarginSize(int value);
QString itemTypeName() const; QString itemTypeName() const;

6
limereport/lrpagedesignintf.cpp
View File

@ -422,11 +422,6 @@ void PageDesignIntf::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
m_selectionRect = 0; m_selectionRect = 0;
m_multiSelectStarted = false; m_multiSelectStarted = false;
} }
// if(m_infoPosRect)
// {
// delete m_infoPosRect;
// m_infoPosRect = 0;
// }
QGraphicsScene::mouseReleaseEvent(event); QGraphicsScene::mouseReleaseEvent(event);
} }
@ -524,6 +519,7 @@ BaseDesignIntf *PageDesignIntf::addReportItem(const QString &itemType, QPointF p
if (band) { if (band) {
BaseDesignIntf *reportItem = addReportItem(itemType, band, band); BaseDesignIntf *reportItem = addReportItem(itemType, band, band);
reportItem->setPos(placePosOnGrid(band->mapFromScene(pos))); reportItem->setPos(placePosOnGrid(band->mapFromScene(pos)));
reportItem->setReportSettings(m_reportSettings);
reportItem->setSize(placeSizeOnGrid(size)); reportItem->setSize(placeSizeOnGrid(size));
reportItem->setUnitType(pageItem()->unitType()); reportItem->setUnitType(pageItem()->unitType());
return reportItem; return reportItem;

8
limereport/scripteditor/lrscripthighlighter.cpp
View File

@ -248,16 +248,16 @@ ScriptHighlighter::ScriptHighlighter(QTextDocument* parent):
} }
if ( isColorDark(QPalette().window().color())){ 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[StringFormat].setForeground(Qt::darkGreen);
m_formats[KeywordFormat].setForeground(Qt::darkYellow); m_formats[KeywordFormat].setForeground(QColor("#cd5125"));
m_formats[CommentFormat].setForeground(Qt::darkGreen); m_formats[CommentFormat].setForeground(QColor("#80807e"));
m_formats[CommentFormat].setFontItalic(true); m_formats[CommentFormat].setFontItalic(true);
} else { } else {
m_formats[NumberFormat].setForeground(QColor("#ff6aad")); m_formats[NumberFormat].setForeground(QColor("#ff6aad"));
m_formats[StringFormat].setForeground(QColor("#b27f40")); m_formats[StringFormat].setForeground(QColor("#b27f40"));
m_formats[KeywordFormat].setForeground(QColor("#45c5d5")); m_formats[KeywordFormat].setForeground(QColor("#45c5d5"));
m_formats[CommentFormat].setForeground(QColor("#a1a4a9")); m_formats[CommentFormat].setForeground(QColor("#a8aaab"));
m_formats[CommentFormat].setFontItalic(true); m_formats[CommentFormat].setFontItalic(true);
} }
} }