From ae37e7d64fa46b043be0c41d269c7367d9468c3d Mon Sep 17 00:00:00 2001 From: The Codacy Badger Date: Mon, 1 Jul 2019 07:54:13 +0000 Subject: [PATCH 01/20] Add Codacy badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 00a80dd..912db77 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![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) LimeReport v1.4.7 [![Build Status](https://api.travis-ci.org/fralx/LimeReport.svg?branch=master)](https://travis-ci.org/fralx/LimeReport) ----------- Official LimeReport web site [http://limereport.ru](http://limereport.ru) From 032786ced1bdb318784c04f55f9476894d702fcc Mon Sep 17 00:00:00 2001 From: fralx Date: Mon, 1 Jul 2019 10:56:19 +0300 Subject: [PATCH 02/20] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 912db77..6845973 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ -[![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) + 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) ----------- From 5b8fc69800b4a069dc6a46e93674b70036c79c58 Mon Sep 17 00:00:00 2001 From: fralx Date: Mon, 1 Jul 2019 10:59:57 +0300 Subject: [PATCH 03/20] Update README.md --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6845973..fef5a32 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ LimeReport v1.4.7 [![Build Status](https://api.travis-ci.org/fralx/LimeReport Official LimeReport web site [http://limereport.ru](http://limereport.ru) ----------- -##Features +## Features * Multi-platform support * Pure Qt4/Qt5 compatible code * Embedded report designer @@ -23,7 +23,7 @@ Official LimeReport web site [http://limereport.ru](http://limereport.ru) * 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: @@ -42,7 +42,7 @@ For more samples see a demo ## Change log -###1.4.7 +### 1.4.7 1. Multipage 2. Dialogs 3. Render events @@ -53,21 +53,21 @@ For more samples see a demo 8. Editable report And many others minor fixes and improvements -###1.3.11 +### 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.3.10 +### 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.3.9 +### 1.3.9 New functions: ```cpp QString::saveToString(), @@ -86,7 +86,7 @@ Performance has been improved 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 @@ -102,7 +102,7 @@ Fixed: 1. Postgresql connection 2. The error that prevented normal run of more than one instance of LimeReport::ReportEngine -###1.2.1 +### 1.2.1 1. Added buttons to open / hide sidebars; 2. Improved look-and-feel of report elements to clarify designing process; 3. Printing to PDF added. From bfe06f5a397ae13616fb04b8ac0f00823cd7efc9 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Fri, 21 Jun 2019 22:12:04 +0300 Subject: [PATCH 04/20] relocateBands function has been fixed --- limereport/lrpageitemdesignintf.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/limereport/lrpageitemdesignintf.cpp b/limereport/lrpageitemdesignintf.cpp index f0904c8..8c11ade 100644 --- a/limereport/lrpageitemdesignintf.cpp +++ b/limereport/lrpageitemdesignintf.cpp @@ -400,7 +400,7 @@ void PageItemDesignIntf::relocateBands() { if (isLoading()) return; - int bandSpace = (itemMode() & DesignMode)?4:0; + int bandSpace = (itemMode() & DesignMode) ? 0 : 0; QVector posByColumn; @@ -443,8 +443,8 @@ void PageItemDesignIntf::relocateBands() m_bands[i+1]->setPos(pageRect().x(),posByColumn[0]); posByColumn[0] += m_bands[i+1]->height()+bandSpace; } else { - m_bands[i+1]->setPos(pageRect().x(),posByColumn[0]+2); - posByColumn[0] += m_bands[i+1]->height()+bandSpace+2; + m_bands[i+1]->setPos(pageRect().x(),posByColumn[0]); + posByColumn[0] += m_bands[i+1]->height()+bandSpace; } } else { m_bands[i+1]->setPos(m_bands[i+1]->pos().x(),posByColumn[m_bands[i+1]->columnIndex()]); From 19390a9aab711d2eb94ef8954325215bbffbf9f5 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Fri, 21 Jun 2019 22:13:54 +0300 Subject: [PATCH 05/20] Version has been changed --- common.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.pri b/common.pri index 207b6b6..556482b 100644 --- a/common.pri +++ b/common.pri @@ -84,7 +84,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 4 -LIMEREPORT_VERSION_RELEASE = 134 +LIMEREPORT_VERSION_RELEASE = 136 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" From c9c0a7f7d935115e0a8e8e1e13e02d6554525362 Mon Sep 17 00:00:00 2001 From: fralx Date: Tue, 2 Jul 2019 23:36:05 +0300 Subject: [PATCH 06/20] Update README.md --- README.md | 96 +++++++++++++++++++++++++++---------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index fef5a32..fb6c2d4 100644 --- a/README.md +++ b/README.md @@ -6,21 +6,21 @@ Official LimeReport web site [http://limereport.ru](http://limereport.ru) ----------- ## Features -* Multi-platform support -* Pure Qt4/Qt5 compatible code -* Embedded report designer -* Embedded preview -* Various band types for a report of any complexity -* Page header and footer -* Data grouping (GroupHeader, GroupFooter, Subdetail, SubdetailHeader, SubdetailFooter) -* Aggregation functions (SUM, COUNT, AVG, MIN, MAX) -* Report elements: Text, Geometric (Line, Ellipsis, Rectangle), Picture -* Horizontal elements groups -* HTML to format input fields -* Scripts to format output data -* An Automatic band height adjustment -* A Smart band split moving data to the next page -* PDF output +* Multi-platform support +* Pure Qt4/Qt5 compatible code +* Embedded report designer +* Embedded preview +* Various band types for a report of any complexity +* Page header and footer +* Data grouping (GroupHeader, GroupFooter, Subdetail, SubdetailHeader, SubdetailFooter) +* Aggregation functions (SUM, COUNT, AVG, MIN, MAX) +* Report elements: Text, Geometric (Line, Ellipsis, Rectangle), Picture +* Horizontal elements groups +* HTML to format input fields +* Scripts to format output data +* An Automatic band height adjustment +* A Smart band split moving data to the next page +* PDF output ## How to use it @@ -43,29 +43,29 @@ For more samples see a demo ## 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 +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.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. 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.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. 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 New functions: @@ -77,8 +77,8 @@ New functions: ``` added to LimeReport::ReportEngine -1. printOnEach page and columns have been added to DataHeader band -2. startNewPage added to DataBand +1. printOnEach page and columns have been added to DataHeader band +2. startNewPage added to DataBand Performance has been improved @@ -88,24 +88,24 @@ To enable HTML support you need to use the property allowHTML ### 1.3.1 Added: -1. Columns +1. Columns Some bands can be divided into columns -2. Items align +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 -4. Group can reset page number; -5. Table mode added to horizontal layout +3. Group can start new page +4. Group can reset page number; +5. Table mode added to 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. Postgresql connection +2. The error that prevented 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; -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; -6. .. and other minor bugs fixed. +1. Added buttons to open / hide sidebars; +2. Improved look-and-feel of report elements to clarify 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; +6. .. and other minor bugs fixed. From ef88c9adac20bbe5d90eda024c20d416dbf4da0b Mon Sep 17 00:00:00 2001 From: fralx Date: Wed, 3 Jul 2019 00:18:57 +0300 Subject: [PATCH 07/20] Update README.md --- README.md | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fb6c2d4..853c88b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -LimeReport v1.4.7 [![Build Status](https://api.travis-ci.org/fralx/LimeReport.svg?branch=master)](https://travis-ci.org/fralx/LimeReport) +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) @@ -42,6 +42,26 @@ For more samples see a demo ## Change log +### 1.5.0 + +1. Added the ability to use QJSEngine instead deprecated QtScript. +2. Emmbedded dialog designer has been added. +3. Script editor has been improved. +4. Added the ability to build only report generator without embedded visual report designer. +5. Report translation ability has been added +6. Added report generation time events with the ability to process them in the report script +7. Added the ability to build a report table of contents +8. Vertical layout has been added +9. Added the ability to transfer an image to the report via a variable +10. Endless height has been added +11. Added the ability to print a report page on multiple pages of paper. +12. Added the ability to print on multiple printers +13. ChartItem has been added +14. Added the ability to use aggregate functions in headers +15. Subtotals +16. Dark and Light themes have been added to report designer +17. Generation result editing mode has been improved + ### 1.4.7 1. Multipage 2. Dialogs From c969aceb636178f4ccec1f8ba25ee269063471c1 Mon Sep 17 00:00:00 2001 From: fralx Date: Wed, 3 Jul 2019 00:19:52 +0300 Subject: [PATCH 08/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 853c88b..986164d 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ For more samples see a demo ### 1.5.0 -1. Added the ability to use QJSEngine instead deprecated QtScript. +1. Added the ability to use QJSEngine instead of deprecated QtScript. 2. Emmbedded dialog designer has been added. 3. Script editor has been improved. 4. Added the ability to build only report generator without embedded visual report designer. From 4d5312886c425588336d55832bafeee583fb5edd Mon Sep 17 00:00:00 2001 From: fralx Date: Wed, 3 Jul 2019 00:20:51 +0300 Subject: [PATCH 09/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 986164d..4fa9229 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ For more samples see a demo ### 1.5.0 1. Added the ability to use QJSEngine instead of deprecated QtScript. -2. Emmbedded dialog designer has been added. +2. Embedded dialog designer has been added. 3. Script editor has been improved. 4. Added the ability to build only report generator without embedded visual report designer. 5. Report translation ability has been added From e748ba083f2c06c2087933fc6babd2b0a49d0c56 Mon Sep 17 00:00:00 2001 From: fralx Date: Wed, 3 Jul 2019 00:26:33 +0300 Subject: [PATCH 10/20] Update README.md --- README.md | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 4fa9229..eb11691 100644 --- a/README.md +++ b/README.md @@ -45,22 +45,25 @@ For more samples see a demo ### 1.5.0 1. Added the ability to use QJSEngine instead of deprecated QtScript. -2. Embedded dialog designer has been added. -3. Script editor has been improved. -4. Added the ability to build only report generator without embedded visual report designer. -5. Report translation ability has been added -6. Added report generation time events with the ability to process them in the report script -7. Added the ability to build a report table of contents -8. Vertical layout has been added -9. Added the ability to transfer an image to the report via a variable -10. Endless height has been added -11. Added the ability to print a report page on multiple pages of paper. -12. Added the ability to print on multiple printers -13. ChartItem has been added -14. Added the ability to use aggregate functions in headers -15. Subtotals -16. Dark and Light themes have been added to report designer -17. Generation result editing mode has been improved +2. Report designer has been improved +3. Inches support has been added +4. Embedded dialog designer has been added. +5. 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. 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 +And many others minor fixes and improvements ### 1.4.7 1. Multipage From dedc32f0bdfecb49b83fa6004efcf4b86f99eadf Mon Sep 17 00:00:00 2001 From: fralx Date: Wed, 3 Jul 2019 19:03:43 +0300 Subject: [PATCH 11/20] Update README.md --- README.md | 68 +++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index eb11691..f6060c3 100644 --- a/README.md +++ b/README.md @@ -45,50 +45,50 @@ For more samples see a demo ### 1.5.0 1. Added the ability to use QJSEngine instead of deprecated QtScript. -2. Report designer has been improved -3. Inches support has been added +2. Report designer has been improved. +3. Inches support has been added. 4. Embedded dialog designer has been added. 5. 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. 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 +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. 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 -And many others minor fixes and improvements +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 others minor fixes and improvements. ### 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. 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. +9. And many others minor fixes and improvements. ### 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. 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.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. 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 New functions: From e9a02f28b84e5b322adf878b3c17cfd81f0edb63 Mon Sep 17 00:00:00 2001 From: fralx Date: Wed, 3 Jul 2019 19:24:59 +0300 Subject: [PATCH 12/20] Update README.md --- README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/README.md b/README.md index f6060c3..3dd0626 100644 --- a/README.md +++ b/README.md @@ -45,24 +45,43 @@ For more samples see a demo ### 1.5.0 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. 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. 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 others minor fixes and improvements. ### 1.4.7 From 48249c68e8cdb6399a1a2aab4a215baef32ecb48 Mon Sep 17 00:00:00 2001 From: fralx Date: Wed, 3 Jul 2019 19:26:59 +0300 Subject: [PATCH 13/20] Update README.md --- README.md | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/README.md b/README.md index 3dd0626..f6060c3 100644 --- a/README.md +++ b/README.md @@ -45,43 +45,24 @@ For more samples see a demo ### 1.5.0 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. 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. 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 others minor fixes and improvements. ### 1.4.7 From cfd561864db4f4de47b6c2603240c71a8cc885e9 Mon Sep 17 00:00:00 2001 From: fralx Date: Wed, 3 Jul 2019 19:28:31 +0300 Subject: [PATCH 14/20] Update README.md --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index f6060c3..2fe6dbe 100644 --- a/README.md +++ b/README.md @@ -53,17 +53,17 @@ For more samples see a demo 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. 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 others minor fixes and improvements. +10. 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 others minor fixes and improvements. ### 1.4.7 1. Multipage. From 7adf51dc444b6045d3ed70cbcbffc673bc6ea0d3 Mon Sep 17 00:00:00 2001 From: fralx Date: Thu, 4 Jul 2019 17:53:01 +0300 Subject: [PATCH 15/20] Update README.md --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 2fe6dbe..1117de4 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ LimeReport v1.5.0 [![Build Status](https://api.travis-ci.org/fralx/LimeReport Official LimeReport web site [http://limereport.ru](http://limereport.ru) ----------- -## Features +# Features * Multi-platform support * Pure Qt4/Qt5 compatible code * Embedded report designer @@ -23,9 +23,9 @@ Official LimeReport web site [http://limereport.ru](http://limereport.ru) * PDF output -## 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: +# 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: ```cpp #include "lrreportengine.h" to add report engine @@ -40,9 +40,9 @@ Official LimeReport web site [http://limereport.ru](http://limereport.ru) ``` For more samples see a demo -## Change log +# Change log -### 1.5.0 +## 1.5.0 1. Added the ability to use QJSEngine instead of deprecated QtScript. 2. Report designer has been improved. @@ -65,7 +65,7 @@ For more samples see a demo 19. Generation result editing mode has been improved. 20. And many others minor fixes and improvements. -### 1.4.7 +## 1.4.7 1. Multipage. 2. Dialogs. 3. Render events. @@ -76,21 +76,21 @@ For more samples see a demo 8. Editable report. 9. And many others minor fixes and improvements. -### 1.3.11 +## 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.3.10 +## 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.3.9 +## 1.3.9 New functions: ```cpp QString::saveToString(), @@ -109,7 +109,7 @@ Performance has been improved 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 @@ -125,7 +125,7 @@ Fixed: 1. Postgresql connection 2. The error that prevented normal run of more than one instance of LimeReport::ReportEngine -### 1.2.1 +## 1.2.1 1. Added buttons to open / hide sidebars; 2. Improved look-and-feel of report elements to clarify designing process; 3. Printing to PDF added. From 6ebac06b13c016b47a375d67901d61f259f8ddc0 Mon Sep 17 00:00:00 2001 From: fralx Date: Thu, 4 Jul 2019 17:58:29 +0300 Subject: [PATCH 16/20] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1117de4..1b682f0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ - 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) ----------- @@ -6,6 +5,7 @@ Official LimeReport web site [http://limereport.ru](http://limereport.ru) ----------- # Features + * Multi-platform support * Pure Qt4/Qt5 compatible code * Embedded report designer @@ -24,6 +24,7 @@ Official LimeReport web site [http://limereport.ru](http://limereport.ru) # 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: From 33933a6a5b4ee9b88f56bccab15fdf60719dc4a0 Mon Sep 17 00:00:00 2001 From: fralx Date: Thu, 4 Jul 2019 18:03:32 +0300 Subject: [PATCH 17/20] Update README.md --- README.md | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 1b682f0..cf7c6b0 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,11 @@ -LimeReport v1.5.0 [![Build Status](https://api.travis-ci.org/fralx/LimeReport.svg?branch=master)](https://travis-ci.org/fralx/LimeReport) +# 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 @@ -23,7 +24,7 @@ Official LimeReport web site [http://limereport.ru](http://limereport.ru) * 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: @@ -41,9 +42,9 @@ Official LimeReport web site [http://limereport.ru](http://limereport.ru) ``` For more samples see a demo -# Change log +## Change log -## 1.5.0 +### 1.5.0 1. Added the ability to use QJSEngine instead of deprecated QtScript. 2. Report designer has been improved. @@ -66,7 +67,7 @@ For more samples see a demo 19. Generation result editing mode has been improved. 20. And many others minor fixes and improvements. -## 1.4.7 +### 1.4.7 1. Multipage. 2. Dialogs. 3. Render events. @@ -77,21 +78,21 @@ For more samples see a demo 8. Editable report. 9. And many others minor fixes and improvements. -## 1.3.11 +### 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.3.10 +### 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.3.9 +### 1.3.9 New functions: ```cpp QString::saveToString(), @@ -110,7 +111,7 @@ Performance has been improved 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 @@ -126,7 +127,7 @@ Fixed: 1. Postgresql connection 2. The error that prevented normal run of more than one instance of LimeReport::ReportEngine -## 1.2.1 +### 1.2.1 1. Added buttons to open / hide sidebars; 2. Improved look-and-feel of report elements to clarify designing process; 3. Printing to PDF added. From 02458d6e4983b2821428cdaad1f928e4f99ceaec Mon Sep 17 00:00:00 2001 From: fralx Date: Thu, 4 Jul 2019 18:44:11 +0300 Subject: [PATCH 18/20] Update README.md --- README.md | 171 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 89 insertions(+), 82 deletions(-) diff --git a/README.md b/README.md index cf7c6b0..b1eafc3 100644 --- a/README.md +++ b/README.md @@ -1,33 +1,29 @@ -# 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) ------------ +# 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) -## Features +## Official LimeReport web site [http://limereport.ru](http://limereport.ru) -* Multi-platform support -* Pure Qt4/Qt5 compatible code -* Embedded report designer -* Embedded preview -* Various band types for a report of any complexity -* Page header and footer -* Data grouping (GroupHeader, GroupFooter, Subdetail, SubdetailHeader, SubdetailFooter) -* Aggregation functions (SUM, COUNT, AVG, MIN, MAX) -* Report elements: Text, Geometric (Line, Ellipsis, Rectangle), Picture -* Horizontal elements groups -* HTML to format input fields -* Scripts to format output data -* An Automatic band height adjustment -* A Smart band split moving data to the next page -* PDF output +### Features +* Multi-platform support +* Pure Qt4/Qt5 compatible code +* Embedded report designer +* Embedded preview +* Various band types for a report of any complexity +* Page header and footer +* Data grouping (GroupHeader, GroupFooter, Subdetail, SubdetailHeader, SubdetailFooter) +* Aggregation functions (SUM, COUNT, AVG, MIN, MAX) +* Report elements: Text, Geometric (Line, Ellipsis, Rectangle), Picture +* Horizontal elements groups +* HTML to format input fields +* Scripts to format output data +* An Automatic band height adjustment +* 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: +1. Build limereport.pro. It will create a limereport shared library +2. In your project connect the limereport library then in source code add: ```cpp #include "lrreportengine.h" to add report engine @@ -40,97 +36,108 @@ 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.5.0 +#### 1.5.0 -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. 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. Vertical layout has been added. +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. +17. Subtotals. 18. Dark and Light themes have been added to report designer. 19. Generation result editing mode has been improved. -20. And many others minor fixes and improvements. +20. And many other minor fixes and improvements. -### 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. -9. And many others minor fixes and improvements. +#### 1.4.7 -### 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. 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.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.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 -2. startNewPage added to DataBand +1. printOnEach page and columns have been added to DataHeader band +2. startNewPage added to DataBand 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 + +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 -4. Group can reset page number; -5. Table mode added to horizontal layout +2. Items align + 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 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. Added buttons to open / hide sidebars; -2. Improved look-and-feel of report elements to clarify 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; -6. .. and other minor bugs fixed. +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 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; +6. .. and other minor bugs fixed. From a2d74f8204d86b0f668424be11b6db00b97db093 Mon Sep 17 00:00:00 2001 From: fralx Date: Thu, 4 Jul 2019 19:49:30 +0300 Subject: [PATCH 19/20] Create .remarkrc --- .remarkrc | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .remarkrc 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": "*" + } +} From afcdee3e243f90d9b732550420069045966815b4 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Thu, 4 Jul 2019 20:41:58 +0300 Subject: [PATCH 20/20] Font editor has been fixed --- common.pri | 2 +- limereport/items/editors/lrfonteditorwidget.cpp | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/common.pri b/common.pri index e4c3616..a0012c5 100644 --- a/common.pri +++ b/common.pri @@ -127,7 +127,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 5 -LIMEREPORT_VERSION_RELEASE = 0 +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