diff --git a/.remarkrc b/.remarkrc new file mode 100644 index 0000000..9b4ed37 --- /dev/null +++ b/.remarkrc @@ -0,0 +1,31 @@ +{ + "presets": ["lint-recommended", "lint-consistent"], + "plugins": { + "remark-lint": { + "unordered-list-marker-style": "consistent", + "list-item-bullet-indent": true, + "list-item-indent": false, + "list-item-spacing": false, + "no-html": false, + "maximum-line-length": false, + "no-file-name-mixed-case": false, + "heading-increment": false, + "no-multiple-toplevel-headings": true, + "no-consecutive-blank-lines": false, + "maximum-line-length": 9000, + "maximum-heading-length": 300, + "no-heading-punctuation": false, + "no-duplicate-headings": false, + "emphasis-marker": "*", + "no-tabs": true, + "blockquote-indentation": false, + "strong-marker": "*" + } + }, + "settings": { + "bullet": "*", + "listItemIndent": "1", + "strong": "*", + "emphasis": "*" + } +} diff --git a/README.md b/README.md index 6c6ee2b..b1eafc3 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ -LimeReport v1.4.7 [![Build Status](https://api.travis-ci.org/fralx/LimeReport.svg?branch=master)](https://travis-ci.org/fralx/LimeReport) -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/bc31412ea4814f30825b5ed3723e9a70)](https://app.codacy.com/app/fralx/LimeReport?utm_source=github.com&utm_medium=referral&utm_content=fralx/LimeReport&utm_campaign=Badge_Grade_Dashboard) ------------ -Official LimeReport web site [http://limereport.ru](http://limereport.ru) ------------ +# LimeReport v1.5.0 [![Build Status](https://api.travis-ci.org/fralx/LimeReport.svg?branch=master)](https://travis-ci.org/fralx/LimeReport) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/bc31412ea4814f30825b5ed3723e9a70)](https://app.codacy.com/app/fralx/LimeReport?utm_source=github.com&utm_medium=referral&utm_content=fralx/LimeReport&utm_campaign=Badge_Grade_Dashboard) + +## Official LimeReport web site [http://limereport.ru](http://limereport.ru) + +### Features -## Features * Multi-platform support * Pure Qt4/Qt5 compatible code * Embedded report designer @@ -21,8 +20,8 @@ Official LimeReport web site [http://limereport.ru](http://limereport.ru) * A Smart band split moving data to the next page * PDF output +### How to use it -## How to use it 1. Build limereport.pro. It will create a limereport shared library 2. In your project connect the limereport library then in source code add: @@ -37,43 +36,73 @@ Official LimeReport web site [http://limereport.ru](http://limereport.ru) report->printReport(); to print report ``` + For more samples see a demo -## Change log +### Change log -### 1.4.7 -1. Multipage -2. Dialogs -3. Render events -4. Initscript -5. Memory usage has been reduced -6. Datasource manager has been refactored -7. Report items context menus have been added -8. Editable report -And many others minor fixes and improvements +#### 1.5.0 -### 1.3.11 -1. LimeReport project structure has been changed -2. Preview widget has been added -3. New demo has been added -4. Landscape page orientation has been fixed -5. Other minor bugs has been fixed +1. Added the ability to use QJSEngine instead of deprecated QtScript. +2. Report designer has been improved. +3. Inches support has been added. +4. Embedded dialog designer has been added. +5. The script editor has been improved. +6. Added the ability to build only report generator without embedded visual report designer. +7. Report translation ability has been added. +8. Added report generation time events with the ability to process them in the report script. +9. Added the ability to build a report table of contents. +10. The vertical layout has been added. +11. Added the ability to transfer an image to the report via a variable. +12. Endless height has been added. +13. Added the ability to print a report page on multiple pages of paper. +14. Added the ability to print on multiple printers. +15. ChartItem has been added. +16. Added the ability to use aggregate functions in headers. +17. Subtotals. +18. Dark and Light themes have been added to report designer. +19. Generation result editing mode has been improved. +20. And many other minor fixes and improvements. -### 1.3.10 -1. Memory leak has been fixed -2. Grid & Settings have been added -3. Recent files menu has been added -4. Magnet feature has been added -5. Added ability to use variables in the connection settings +#### 1.4.7 + +1. Multipage. +2. Dialogs. +3. Render events. +4. Initscript. +5. Memory usage has been reduced. +6. Data source manager has been refactored. +7. Report items context menus have been added. +8. Editable report. +9. And many other minor fixes and improvements. + +#### 1.3.11 + +1. The LimeReport project structure has been changed. +2. Preview widget has been added. +3. A new demo has been added. +4. Landscape page orientation has been fixed. +5. Other minor bugs have been fixed. + +#### 1.3.10 + +1. A memory leak has been fixed. +2. Grid & Settings have been added. +3. Recent files menu has been added. +4. Magnet feature has been added. +5. Added ability to use variables in the connection settings. + +#### 1.3.9 -### 1.3.9 New functions: + ```cpp QString::saveToString(), loadFromString(const QString& report, const QString& name=""), QByteArray::saveToByteArray(), setCurrentReportsDir(const QString& dirName), ``` + added to LimeReport::ReportEngine 1. printOnEach page and columns have been added to DataHeader band @@ -82,28 +111,32 @@ added to LimeReport::ReportEngine Performance has been improved **WARNING** -From this version the item "Text" by default does not use HTML. +From this version, the item "Text" by default does not use HTML. To enable HTML support you need to use the property allowHTML -### 1.3.1 +#### 1.3.1 + Added: + 1. Columns Some bands can be divided into columns 2. Items align - Report items now may be aligned to the left,right or center of container - also it can be stretched to the whole width of container -3. Group can start new page + Report items now may be aligned to the left, right or center of the container + also it can be stretched to the whole width of the container +3. Group can start a new page 4. Group can reset page number; -5. Table mode added to horizontal layout +5. Table mode added to the horizontal layout This mode allows you to distribute the internal layout's space among grouped items Fixed: -1. Postgresql connection -2. The error that prevented normal run of more than one instance of LimeReport::ReportEngine -### 1.2.1 +1. Postgresql connection +2. The error that prevented the normal run of more than one instance of LimeReport::ReportEngine + +#### 1.2.1 + 1. Added buttons to open / hide sidebars; -2. Improved look-and-feel of report elements to clarify designing process; +2. Improved look-and-feel of report elements to clarify the designing process; 3. Printing to PDF added. 4. Fixed bug in SQL-editor when it used variables in SQL expression; 5. Fixed bug of variable's initialization if it exists more than once in SQL expression; diff --git a/common.pri b/common.pri index dee91fc..a0012c5 100644 --- a/common.pri +++ b/common.pri @@ -126,8 +126,8 @@ OBJECTS_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/obj RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 -LIMEREPORT_VERSION_MINOR = 4 -LIMEREPORT_VERSION_RELEASE = 136 +LIMEREPORT_VERSION_MINOR = 5 +LIMEREPORT_VERSION_RELEASE = 1 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" diff --git a/limereport/items/editors/lrfonteditorwidget.cpp b/limereport/items/editors/lrfonteditorwidget.cpp index 5d1a306..3a8cf0d 100644 --- a/limereport/items/editors/lrfonteditorwidget.cpp +++ b/limereport/items/editors/lrfonteditorwidget.cpp @@ -140,19 +140,24 @@ void FontEditorWidget::slotPropertyChanged(const QString &objectName, const QStr void FontEditorWidgetForPage::slotFontChanged(const QFont& font) { - m_page->setFont(font); + if (!ignoreSlots()) + m_page->setFont(font); } void FontEditorWidgetForPage::slotFontSizeChanged(const QString& value) { - FontEditorWidget::slotFontSizeChanged(value); - m_page->setFont(resFont()); + if (!ignoreSlots()){ + FontEditorWidget::slotFontSizeChanged(value); + m_page->setFont(resFont()); + } } void FontEditorWidgetForPage::slotFontAttribsChanged(bool value) { - FontEditorWidget::slotFontAttribsChanged(value); - m_page->setFont(resFont()); + if (!ignoreSlots()){ + FontEditorWidget::slotFontAttribsChanged(value); + m_page->setFont(resFont()); + } } #ifdef HAVE_REPORT_DESIGNER