Commit Graph

564 Commits

Author SHA1 Message Date
fralx
ef834ebe14 Merge pull request #82 from Spiek/develop
Debug compile target improvings
2017-07-21 20:02:43 +03:00
Spiek
6b0195cb89 If compiling in debug mode append a "d" to the Target and also link to that files 2017-07-21 17:54:22 +02:00
Arin Alex
794ada650f Merge remote-tracking branch 'origin/develop' into develop 2017-07-14 18:36:44 +03:00
Arin Alex
3b1d6bfbbe Datasource editor has been added to chart item 2017-07-14 18:36:31 +03:00
Arin Alexander
0a60babd69 Finish 1.4.34
# Conflicts:
#	limereport/lrreportrender.cpp
2017-07-14 17:44:39 +03:00
Arin Alexander
0e870003e3 Page items zValue has been changed 2017-07-14 17:39:47 +03:00
Arin Alex
1b8bd14b35 Labels column has been fixed 2017-07-13 14:39:07 +03:00
Arin Alex
c090883cf1 Merge branch 'develop' into 1.4_ChartItem
Conflicts:
	limereport/items/items.qrc
	limereport/limereport.pri
2017-07-12 21:40:24 +03:00
fralx
49b6e9500a Merge pull request #80 from Spiek/develop
Fix Windows Build Enviroment
2017-07-11 12:50:02 +03:00
Arin Alexander
dbfcf29d67 Merge branch 'master' into develop 2017-07-11 12:46:14 +03:00
Arin Alexander
c6d5e23ddf Subdetail headers render for column mode has been fixed 2017-07-11 12:44:52 +03:00
Spiek
ec37242475 Build Environment for Windows has been fixed
- language files are now compile-able if path to build environment contains white spaces
- demo reports are now copied correctly if REPORTS_DIR or EXTRA_DIR contains white spaces
2017-07-11 11:18:28 +02:00
Arin Alexander
dbf56182d2 Build has been fixed 2017-06-30 13:52:27 +03:00
Arin Alexander
fa2ef0f643 Build has been fixed 2017-06-30 13:52:17 +03:00
Arin Alexander
7bc8092191 Band names translation has been fixed
Subdetail header render has been fixed

# Conflicts:
#	limereport/lrreportrender.cpp
2017-06-30 13:29:00 +03:00
Arin Alexander
c3ff1ff462 Subdetail header render has been fixed 2017-06-30 13:22:41 +03:00
Arin Alexander
9c95206dfe Band names translation has been fixed 2017-06-30 13:21:16 +03:00
Arin Alexander
36d72a5756 Script function names have been translated 2017-06-29 03:16:30 +03:00
Arin Alexander
815a67e17d Function categories have been translated 2017-06-29 03:04:30 +03:00
Arin Alexander
68d0bba8cd Fix #79: qDebug "render time" message 2017-06-29 02:47:32 +03:00
Arin Alexander
774f334e40 Fix #79: qDebug "render time" message 2017-06-29 02:46:48 +03:00
Arin Alexander
0b6749aef0 Band names translation has been added
# Conflicts:
#	limereport/lrbanddesignintf.h
2017-06-29 02:34:08 +03:00
Arin Alexander
e3d01f1451 Band names translation has been added 2017-06-29 02:32:42 +03:00
Arin Alexander
c40169146c Band location has been fixed
# Conflicts:
#	limereport/lrbanddesignintf.h
2017-06-29 00:57:41 +03:00
Arin Alexander
bf38d57406 Band location has been fixed 2017-06-29 00:55:16 +03:00
Arin Alexander
865d9fca5c Object properties translation has been updated
# Conflicts:
#	translations/limereport_ru.ts
2017-06-28 18:42:17 +03:00
Arin Alexander
f671c3a347 Object properties translation has been updated 2017-06-28 18:40:55 +03:00
Arin Alexander
96c8234872 Russian translation has been fixed 2017-06-28 17:15:05 +03:00
Arin Alexander
36df242787 Russian translation has been fixed
# Conflicts:
#	translations/limereport_ru.ts
2017-06-28 17:00:58 +03:00
Arin Alexander
1354c4a253 Russian translation has been fixed 2017-06-28 16:58:01 +03:00
Arin Alexander
69feef3d98 Callback datasource has been fixed 2017-06-23 16:04:45 +03:00
Arin Alexander
b87009e1de Callback datasource has been fixed 2017-06-23 16:03:50 +03:00
Arin Alexander
7722aefa16 Page items have been fixed 2017-06-23 09:58:45 +03:00
Arin Alexander
a43739e91a Page items have been fixed 2017-06-23 09:57:02 +03:00
Arin Alexander
2383ab253d Finish 1.4.20 2017-06-21 23:54:28 +03:00
Arin Alexander
b0538393d1 Callback datasource columnIndexByName() has been fixed 2017-06-21 23:53:26 +03:00
Arin Alexander
4aa5f558dd Callback datasource has been fixed 2017-06-20 06:00:53 +03:00
Arin Alexander
0d64591085 Callback datasource has been fixed 2017-06-20 05:59:39 +03:00
Arin Alex
2e6a7473ea no_zint & static_build flags has been added
# Conflicts:
#	common.pri
2017-06-16 03:10:00 +03:00
Arin Alex
2c0e343c55 Static build has been fixed.
CONFIG no_zint & static_build flags have been added
2017-06-16 03:06:09 +03:00
Arin Alex
ad99677d9c "THIS" pointer to report item has been fixed 2017-06-16 03:03:40 +03:00
Arin Alexander
9e5125c8fb Static build has been fixed 2017-06-14 12:07:40 +03:00
Arin Alexander
6a42e0c46c Static build has been fixed 2017-06-14 12:07:02 +03:00
Arin Alexander
4c791e607c Merge branch 'master' into develop
# Conflicts:
#	limereport/lrreportrender.cpp
#	limereport/lrreportrender.h
2017-06-13 19:05:15 +03:00
Arin Alexander
b17aadb2bb Using group functions in the horizontal layout items has been fixed 2017-06-13 17:48:22 +03:00
Arin Alexander
bd67cf8f12 Build without zint has been fixed
# Conflicts:
#	limereport/limereport.pri
2017-06-13 13:05:36 +03:00
Arin Alexander
6ed6beb395 build without zint has been fixed 2017-06-13 13:03:38 +03:00
Arin Alexander
4ca7d7176b Merge branch 'master' into develop
# Conflicts:
#	limereport/lrreportrender.cpp
2017-06-12 13:39:36 +03:00
Arin Alexander
41d09a15ea Nested groups has been fixed for callback datasources (Thanks to Louis Coetzer) 2017-06-12 13:36:30 +03:00
Arin Alexander
b40d83ab07 Finish 1.4.13 2017-06-12 13:11:18 +03:00
Arin Alexander
801b3b4922 Static build has been fixed 2017-06-12 13:11:00 +03:00
Arin Alexander
ffe9a7e67c Finish 1.4.12 2017-06-07 23:48:24 +03:00
Arin Alexander
0786ee1f32 Group function pattern has been fixed 2017-06-07 23:47:43 +03:00
Arin Alexander
fb494db947 Extended area has been added to page in design mode 2017-06-02 22:11:53 +03:00
Arin Alexander
c4f20b78c1 1.4.11
# Conflicts:
#	limereport/items/lrtextitem.cpp
2017-05-15 20:32:33 +03:00
Arin Alexander
2312c21d84 followTo has been fixed 2017-05-15 20:30:54 +03:00
Arin Alexander
27a88969b0 1.4.10 2017-04-21 23:04:25 +03:00
Arin Alexander
e3df7c88d1 Print range from QPrinter fix 2017-04-21 23:03:56 +03:00
Arin Alexander
d89fcc53a8 Prevent multi run initscript
Prevent multi run initscript

Prevent multi run initscript &
Build without HAVE_UI_LOADER has been fixed
2017-04-21 00:12:25 +03:00
Arin Alexander
cbf205b728 1.4.9 2017-04-20 21:10:31 +03:00
Arin Alexander
b3529ffd0c TextItem render has been fixed 2017-04-20 21:09:52 +03:00
Andy Maloney
94db98d596 Optionally monitor changes to files loaded with ReportEngine::loadFromFile()
When using the designer as a stand alone application and the renderer/preview in the
user application, the preview window would have to be closed and opened again every
time a change was made to the report.

This change adds an optional QFileSystemWatcher to monitor changes to the report file
and automatically refreshes the preview in the application when it is saved.

It may be turned on using the new parameter to ReportEngine::loadFromFile().

If the preview window is open in the application and the file name changes or the file is
removed, inform the user and close the preview window.
2017-04-19 22:43:48 -04:00
Andy Maloney
e786a9a6e6 Fix spelling: slotPreviewWindowDestroed -> slotPreviewWindowDestroyed 2017-04-19 21:48:37 -04:00
Arin Alexander
0f6f2f1536 Merge branch 'develop' into feature/CH_Private_To_Public 2017-04-19 01:58:22 +03:00
Arin Alexander
64c4a7fc3d Icons have been changed 2017-04-19 02:44:57 +04:00
Arin Alexander
1700576394 Qt4 build fixed 2017-04-19 02:04:14 +04:00
Arin Alexander
cb438ceff1 Merge branch 'develop' into feature/CH_Private_To_Public
# Conflicts:
#	limereport/lrreportdesignwidget.cpp
#	limereport/lrreportdesignwidget.h
#	limereport/lrreportdesignwindow.h
2017-04-18 22:21:24 +03:00
Arin Alexander
d0cf6f4961 Finish Dialog_Designer
# Conflicts:
#	limereport/limereport.pri
2017-04-18 21:53:19 +03:00
Arin Alexander
3bdec95a8c Icons have been changed 2017-04-18 21:47:35 +03:00
Arin Alexander
02a8ef8b5c Crash on destroy has been fixed 2017-04-18 20:00:59 +03:00
Arin Alexander
7b04b6efca Dialog Designer intergration has been finished 2017-04-14 02:43:34 +03:00
Arin Alexander
0692435b26 Dialog designers tool bar integration has been added 2017-04-11 11:23:34 +03:00
Arin Alexander
cd2e748a9b QtDesigner integration has been added
QtDesigner intergration has been added
2017-04-10 18:45:54 +03:00
fralx
fae194b36f Merge pull request #72 from asmaloney/fix-crash
Fix crash when cutting an item using the context menu
2017-04-10 11:18:53 +03:00
fralx
fa96013d82 Merge pull request #71 from asmaloney/missing-initialization
Add missing initializers
2017-04-10 11:18:26 +03:00
fralx
a5231058ec Merge pull request #70 from asmaloney/fix-shadows
Fixes some shadowed vars & avoids string copies using const refs
2017-04-10 11:17:38 +03:00
fralx
a09006125d Merge pull request #69 from asmaloney/fix-spelling
Corrects spelling of method name
2017-04-10 11:17:10 +03:00
fralx
6105051d27 Merge pull request #66 from asmaloney/fix-returning-deleted-data
Ensure we aren't returning data that has been deleted …
2017-04-10 11:15:56 +03:00
fralx
79e70adf00 Merge pull request #65 from asmaloney/fix-potential-nullptr-use
Fixes a few instances where nullptrs might be dereferenced
2017-04-10 11:14:06 +03:00
Andy Maloney
8ee7fc01e5 Fix crash when cutting an item using the context menu
page->cut() is deleting the object, which means that "this" is no longer valid, and then we're trying to call `processPopUpAction()` on it.
2017-04-09 11:43:26 -04:00
Andy Maloney
aa5b4c6a66 Add missing initializers 2017-04-08 21:38:23 -04:00
Andy Maloney
6789b01e79 Fixes some shadowed vars & avoids string copies using const refs 2017-04-08 18:45:58 -04:00
Andy Maloney
64331fbaeb Corrects spelling of method name 2017-04-08 12:53:05 -04:00
Andy Maloney
942da982ca Ensure we aren't returning data that has been deleted by setting the pointer to NULL. 2017-04-08 09:42:08 -04:00
Andy Maloney
7ebc42c514 Fixes a few instances where nullptrs might be dereferenced 2017-04-08 09:35:09 -04:00
Andy Maloney
3ae754e3dd Fix a memory leak in PageDesignIntf::copy() 2017-04-08 09:31:02 -04:00
Andy Maloney
491f7b49d7 Fix "hidden overloaded virtual function" warning
I'm presuming that TearOffBand::isUnique() is supposed to override the base class's isUnique(), but it was missing a const...
2017-04-07 23:02:58 -04:00
Arin Alex
f86e5a8c28 Merge branch 'develop' into feature/agg_functions_in_header 2017-04-05 01:09:20 +03:00
Arin Alex
cf0fd8967b Finish 1.4.8 2017-04-05 00:58:17 +03:00
Arin Alex
6dca8b27cb Fix #61 AutoHeight overlapping 2017-04-05 00:58:04 +03:00
Arin Alexander
188ab54ee2 ReportEnginePrivate has been changed to ReportEngine in PrewiewWindow and DesignerWindow 2017-03-22 14:42:09 +03:00
Arin Alexander
4559925af4 aggregate functions can be called in data header 2017-03-21 18:01:35 +03:00
Arin Alexander
0505801e3a printBeforePageHeader property has been added to "ReportHeader" band 2017-03-19 14:03:13 +03:00
Arin Alexander
1cb6c1f02e 1.4.7 2017-03-09 14:00:23 +03:00
Arin Alexander
97365e0f4d borderLineSize has been fixed 2017-03-09 14:00:02 +03:00
Arin Alexander
6529ced062 COUNT function has been fixed 2017-03-08 04:59:40 +03:00
Arin Alexander
8fd7c27837 Finish 1.4.6 2017-03-07 19:09:34 +03:00
Arin Alexander
d86c6f226b Group functions have been fixed 2017-03-07 19:09:13 +03:00
Arin Alexander
f0ef99b223 1.4.5 2017-03-06 18:46:38 +03:00
Arin Alexander
55364608c3 Nested groups has been fixed 2017-03-06 18:46:16 +03:00
Arin Alexander
d250015839 Default system printer will selected in "printer select dialog" by default 2017-03-05 16:39:50 +03:00
Arin Alexander
b963428f4c "Transparent" menu item has been added to TextItem context menu 2017-03-04 00:30:52 +03:00
Arin Alexander
242dbe75d2 useAlternateBackgroundColor property has been added 2017-03-04 00:21:21 +03:00
Arin Alexander
4c6c0dfd3b QString -> tr 2017-03-03 23:47:10 +03:00
Arin Alexander
2cc8569b1c 1.4.4 2017-03-03 01:24:23 +03:00
Arin Alexander
322ded3659 Null pointer access has been fixed 2017-03-03 01:12:29 +03:00
Arin Alexander
9ab3cb5803 Fix subquery loading 2017-03-03 00:55:35 +03:00
Arin Alexander
727b6c9436 1.4.3 2017-03-03 00:31:18 +03:00
Arin Alexander
ef712cca5f Fixed the error occurred during loading a report if the report contains data sources with identical names to data sources added by application 2017-03-03 00:30:54 +03:00
Arin Alexander
c0b4c65e9e 1.4.2 2017-03-02 20:53:36 +03:00
Arin Alexander
84bb15802c msvc build fixed 2017-03-02 20:22:49 +03:00
Arin Alexander
915b335fb5 Qt 4.8 build fixed 2017-03-02 19:47:42 +03:00
Arin Alexander
584d465417 Merge branch '1.4_QJSEngine' into feature/QJSEngine
# Conflicts:
#	common.pri
2017-03-01 03:56:00 +03:00
Arin Alex
1d8178de0a New logo has been added 2017-03-01 01:32:19 +03:00
Arin Alexander
ddc793f6e4 Merge branch '1.4'
# Conflicts:
#	limereport/items/lrtextitem.cpp
#	limereport/items/lrtextitem.h
#	limereport/lrdatasourcemanager.cpp
#	limereport/lrdatasourcemanager.h
2017-03-01 00:40:36 +03:00
Arin Alexander
5f9dd684e3 Merge branch '1.4' into 1.4_QJSEngine 2017-02-28 23:54:18 +03:00
Arin Alexander
6c9b408723 misprint has been fixed 2017-02-28 23:22:48 +03:00
Arin Alexander
a2c93601d0 Items context menu has been added
Fields drag & drop init  band datasource if it empty
2017-02-24 07:13:56 +03:00
Arin Alexander
1d3646bd1a Merge branch '1.4' into 1.4_QJSEngine 2017-02-22 04:00:10 +03:00
Arin Alex
117023e920 Script browser update has been fixed 2017-02-22 00:20:37 +03:00
Arin Alex
3975406487 Check connection has been fixed 2017-02-21 22:16:09 +03:00
Arin Alexander
28c8ae66e1 Esc close the preview window 2017-02-21 18:36:30 +03:00
Arin Alexander
bf81d3f98c DataBrowser shows application connection 2017-02-18 17:22:04 +03:00
Arin Alexander
ce3a905c55 Database connections have been refactored
keepDbCredentials property has been added to Connection
setPassPharse(QString& passPharse) method has been added to ReportEngine
IDbCredentialsProvider interface has been added
registerDbCredentialsProvider(IDbCredentialsProvider *provider) has been
added to IDataSourceManager
2017-02-16 04:24:34 +03:00
Arin Alexander
75c5ae65da Merge branch '1.4' into 1.4_QJSEngine 2017-02-16 04:12:15 +03:00
Arin Alexander
d9285813ac Database connections have been refactored
"defaultConnection" has been added to Designer
keepDbCredentials property has been added to Connection
setPassPharse(QString& passPharse) method has been added to ReportEngine
IDbCredentialsProvider interface has been added
registerDbCredentialsProvider(IDbCredentialsProvider *provider) has been added to IDataSourceManager
2017-02-16 04:11:39 +03:00
Arin Alexander
0c863f5ad7 Merge branch '1.4' into 1.4_QJSEngine 2017-02-15 02:52:27 +03:00
Arin Alexander
fa985d7fb7 defaultConnection support has been added to LimeReport designer 2017-02-15 02:52:11 +03:00
Arin Alexander
1b97f3dd40 Merge branch '1.4' into 1.4_QJSEngine 2017-02-15 00:10:19 +03:00
Arin Alexander
8fb3fb5aba LimeReport will not delete external connections 2017-02-15 00:10:02 +03:00
Arin Alexander
84f4e92d1d Merge branch '1.4' into 1.4_QJSEngine 2017-02-11 00:25:14 +03:00
Arin Alexander
8659818a30 Connection will be restored if server is gone away or drop limereport connection 2017-02-11 00:24:59 +03:00
Arin Alexander
7406789cbb QJSEngine -> QQmlEngine 2017-02-11 00:21:03 +03:00
Arin Alexander
034f254d5c Connection will be restored if server is gone away or drop limereport connection 2017-02-10 23:08:49 +03:00
Arin Alexander
c37a310918 Merge branch '1.4' into 1.4_QJSEngine
# Conflicts:
#	limereport/lritemdesignintf.cpp
#	limereport/lrreportrender.cpp
#	limereport/lrscriptenginemanager.cpp
2017-02-08 19:21:08 +03:00
Arin Alexander
f7a3ff622b beforeRender, afterRender signals have been added to ReportPage 2017-02-04 22:15:56 +03:00
Arin Alexander
7af7a16840 fix #59 setResultEditable(bool value) has been added 2017-02-03 14:20:30 +03:00
Arin Alexander
21b3f0e912 fix #58 PDF file extension 2017-02-03 14:18:28 +03:00
Arin Alexander
f409f54e8f Arabic translation has been added 2017-02-01 23:56:12 +03:00
Arin Alexander
afc8ad77b2 Group functions have been refactored. From now they can use script expression in value parameter 2017-01-28 03:49:26 +03:00
Arin Alexander
887710d728 ImageItem design time label has been fixed 2017-01-23 12:11:48 +03:00
Arin Alexander
f927f3a83c followTo has been fixed 2017-01-23 11:53:07 +03:00
Arin Alexander
0261a11b30 textLayoutDirection property has been added to TextItem 2017-01-20 23:26:18 +03:00
Arin Alexander
e327c64fed textIndent property has been added to TextItem 2017-01-20 23:07:54 +03:00
Arin Alexander
6e895e9423 "Datasource not found" suppressed for empty data source at subdetail band 2017-01-09 18:30:20 +03:00
Arin Alexander
2af7c5c7dd Fix: #57 Callback DataSource initialized before signals/slots are connected 2017-01-05 14:46:06 +03:00
Arin Alexander
f613400839 Fix: #57 Callback DataSource initialized before signals/slots are connected 2017-01-05 14:39:20 +03:00
Arin Alexander
081b422468 COUNT function can be called with only one databand argument 2016-12-24 14:01:35 +03:00
Arin Alexander
658a6e7e09 followTo has been fixed 2016-12-24 11:49:56 +03:00
Arin Alexander
3807ac0c57 limereport.pri for static building and aliases have been added 2016-12-22 02:08:27 +03:00
Arin Alexander
7da0cfd7e2 backgroundBrushStyle property has been added 2016-12-21 22:09:10 +03:00
Arin Alexander
dd214ca247 init script error message has been added 2016-12-21 18:21:20 +03:00
Arin Alexander
edd2c43545 beforeRender, afterData, afterRender signals have been added
getVariable, getField functions have been added
2016-12-20 01:33:58 +03:00
Arin Alexander
64b2c9b8d9 Merge branch '1.4' into 1.4_lowMemory 2016-12-13 13:16:37 +03:00
Arin Alexander
791efd136e Merge branch 'master' into 1.4
# Conflicts:
#	limereport/lrreportengine.cpp
2016-12-13 12:51:47 +03:00
Arin Alexander
e138ee2a7e Merge branch 'master' into master_lowMemory 2016-12-13 12:48:16 +03:00
Arin Alexander
97bd5e4584 Fix #56 isBusy has been added to ReportEngine 2016-12-13 12:47:55 +03:00
Arin Alexander
eeea8c2643 QTextDocument is created as needed 2016-12-13 00:07:50 +03:00
Arin Alexander
46c830212f Render child bands has been fixed 2016-12-12 23:41:38 +03:00
Arin Alexander
fcf9590745 QTextDocument is created as needed 2016-12-12 23:24:49 +03:00
Arin Alex
32bf7765ec Render empty data band has been fixed 2016-12-07 23:04:15 +03:00
Arin Alex
2cb5f8e71c Merge branch 'master' into 1.4 2016-12-07 21:11:31 +03:00
lchauvinQt
80fa86a3ca Fix random crash while scrolling into the viewer, avoid the index out of range when the " m_currentPage " is not valid 2016-12-06 16:28:28 +01:00
Arin Alexander
54562d80cd checkIfEmpty has been refactored 2016-12-06 00:27:21 +03:00
Arin Alexander
229e8f529d resourcePath property has been added to ImageItem 2016-12-06 00:27:09 +03:00
Arin Alexander
dc5ee3d98b Debug messages have been removed 2016-11-25 23:54:23 +03:00
Arin Alexander
151ae9d73d Merge branch '1.4' into 1.4_followTo 2016-11-25 23:11:15 +03:00
Arin Alexander
61653c9bb3 Calculated condition has been added to group band header 2016-11-18 01:12:23 +03:00
Arin Alexander
7986fda128 Merge branch '1.4' into 1.4_QJSEngine 2016-11-17 00:42:24 +03:00
Arin Alexander
65d7bc7774 Merge branch 'master' into 1.4 2016-11-17 00:38:00 +03:00
Arin Alexander
2fb47a5830 Connect connection has been refactored 2016-11-17 00:37:37 +03:00
Arin Alex
33959d3882 Icons have been changed 2016-11-16 01:31:06 +03:00
Arin Alex
32620ef918 Merge branch '1.4' into 1.4_QJSEngine 2016-11-08 01:10:05 +03:00
Arin Alex
71aaaac34d Merge branch 'master' into 1.4 2016-11-08 01:09:54 +03:00
Arin Alex
0055790bcd setDefaultDatabasePath() has been added to DataSourceManager 2016-11-08 01:09:35 +03:00
Arin Alex
6127db13e6 Merge branch '1.4' into 1.4_ChartItem
Conflicts:
	limereport/items/items.qrc
2016-11-07 20:23:47 +03:00
Arin Alex
b04c1a2670 Merge branch '1.4' into 1.4_QJSEngine 2016-11-07 20:21:32 +03:00
Arin Alex
be67e6309b pri file has been refactored
pri file refactored
2016-11-07 20:19:09 +03:00
Arin Alex
9fe00a0e41 Merge branch 'master' into 1.4 2016-11-07 20:18:49 +03:00
Arin Alexander
85550995b6 Merge branch '1.4' into 1.4_QJSEngine 2016-11-05 18:13:07 +03:00
Arin Alexander
0bfff7cb00 Merge branch 'master' into 1.4 2016-11-05 18:12:41 +03:00
Arin Alexander
77b151a788 Insert mode is canceled when band inserted 2016-11-05 18:12:10 +03:00
Arin Alexander
47b5aca63a Merge branch '1.4' into 1.4_QJSEngine 2016-11-05 00:48:39 +03:00
Arin Alexander
fbb9ac47af Merge branch 'master' into 1.4
# Conflicts:
#	translations/limereport_es_ES.qm
#	translations/limereport_es_ES.ts
#	translations/limereport_ru.qm
#	translations/limereport_ru.ts
2016-11-05 00:39:51 +03:00
Arin Alexander
8c09e5ed51 Images has been changed 2016-11-05 00:37:33 +03:00
Arin Alexander
97c1eb3f77 Dialogs for QJSEngine has been fixed. Child objects registration has been added 2016-11-04 21:42:15 +03:00
Arin Alexander
5b95b9b3d6 followTo has been added
followTo has been added
2016-11-04 01:25:46 +03:00
Arin Alexander
04745def1e TextItem splitting has been fixed 2016-11-04 01:24:03 +03:00
Arin Alex
db87e5dc9e Build with uitools has been fixed 2016-11-02 11:15:05 +03:00
Arin Alex
7c02c77aaf CharItem has been added 2016-11-02 01:34:45 +03:00
Arin Alex
9d82ac19ee Merge branch 'master' into 1.4 2016-11-02 00:58:50 +03:00
Arin Alex
c786be0ca4 pri file has been refactored
pri file refactored
2016-11-02 00:57:55 +03:00
Arin Alex
4520347dbe Merge branch '1.4' into 1.4_QJSEngine 2016-11-01 22:32:12 +03:00
Arin Alex
f01c586926 Merge branch 'master' into 1.4 2016-11-01 22:32:02 +03:00
Arin Alex
bb6e934152 Band background color has been fixed 2016-11-01 22:31:48 +03:00
Arin Alex
2034aa15c8 QJSEngine has been added 2016-11-01 20:42:45 +03:00
Arin Alex
3bf993eb5a Merge branch 'master' into 1.4 2016-11-01 20:07:30 +03:00
Arin Alex
724e3c004c TextItem has been fixed 2016-11-01 20:07:10 +03:00
Arin Alexander
16605c1414 Merge branch 'master' into 1.4 2016-11-01 14:56:18 +03:00
Arin Alexander
c623932afb Object inspector has been fixed 2016-11-01 14:56:06 +03:00
Arin Alexander
a6d17858cf Merge branch 'master' into 1.4 2016-10-19 17:33:39 +03:00
Arin Alexander
b8ecc89ff0 ObjectInspector for dark themes has been fixed 2016-10-19 17:33:26 +03:00
Arin Alexander
503329bca2 Merge branch 'master' into 1.4 2016-10-19 01:26:52 +03:00
Arin Alexander
2768d13301 Property editing of multi selected objects has been fixed 2016-10-19 01:26:40 +03:00
Arin Alexander
2152c3f4f1 Merge branch 'master' into 1.4 2016-10-18 15:00:40 +03:00
Arin Alexander
ebde2c1c20 Hide unused warnings 2016-10-18 15:00:26 +03:00
Arin Alexander
856a3e6bee Merge branch 'master' into 1.4 2016-10-18 13:58:49 +03:00
Arin Alexander
8ed24f9f75 alternateBackgrounColor property has been added 2016-10-18 13:58:26 +03:00
Arin Alexander
6e74cd266f Merge branch 'master' into 1.4 2016-10-12 00:54:09 +04:00
Arin Alexander
dd40aa1137 TextItem splitting has been fixed 2016-10-12 00:53:49 +04:00
Arin Alexander
d95d1fef1d Merge branch 'master' into 1.4 2016-10-07 00:57:57 +04:00
Arin Alexander
6a55e6c0c2 columnCount and columnsFillDirection properties have been added to DataHeaderBand, DataFooterBand, SubDetailHeaderBand and SubDetailFooterBand 2016-10-07 00:57:38 +04:00
Arin Alexander
6982edc8ec Disable creation of Tear-off band if it exists 2016-10-04 04:55:02 +04:00
Arin Alexander
d6eedd8cbd Merge branch 'master' into 1.4
# Conflicts:
#	limereport/limereport.pri
#	limereport/lrreportrender.cpp
2016-10-04 04:47:05 +04:00
Arin Alexander
dc41959d52 Tear-off band has been added
Tear-off band has been added

Tear-off band has been added
2016-10-04 04:23:55 +04:00
Arin Alexander
e4457787f5 Merge branch 'master' into 1.4 2016-10-03 22:56:58 +04:00
Arin Alexander
46e89b8e9d Fix #51 4.6 build 2016-10-03 22:56:48 +04:00
Arin Alexander
d9e865592e Merge branch 'master' into 1.4 2016-10-03 20:56:16 +04:00
Arin Alexander
d0091cb2f7 Rendering report with DataHeader band has been fixed 2016-10-03 20:56:05 +04:00
Arin Alexander
1e7aa027d7 Merge branch 'master' into 1.4
# Conflicts:
#	limereport/lrreportrender.cpp
2016-09-28 02:27:45 +04:00
Arin Alexander
fc271d6a3b Nested group bands render has been fixed 2016-09-28 02:24:55 +04:00
Arin Alexander
2b63fa1149 Merge branch 'master' into 1.4
# Conflicts:
#	limereport/lrreportrender.cpp
2016-09-18 12:26:48 +04:00
Arin Alexander
7c4d3bf8da Fix #48 the error about "initDatasources" 2016-09-18 12:05:46 +04:00
Arin Alexander
f1e0be4a91 Merge branch 'master' into 1.4 2016-09-16 15:48:18 +04:00
Arin Alexander
2cc1cc0d13 Paste command does not change the name of the item if it does not exist 2016-09-16 15:45:31 +04:00
Arin Alexander
2b8422a9f3 Merge branch 'master' into 1.4 2016-09-16 03:32:32 +04:00
Arin Alexander
45610e7e19 Items removing have been fixed 2016-09-16 03:32:14 +04:00
Arin Alexander
8f188414ed master build has been fixed 2016-09-16 03:31:22 +04:00
Arin Alexander
50cd32492e Merge branch 'master' into 1.4 2016-09-16 03:02:42 +04:00
Arin Alexander
2a6f8313e0 Misprints have been fixed 2016-09-16 03:02:32 +04:00
Arin Alexander
c3cc76ca8b Pagination has been fixed 2016-09-16 02:59:56 +04:00
Arin Alexander
5832d77112 Merge branch 'master' into 1.4 2016-09-09 21:50:04 +04:00
Arin Alexander
eca9e7a1b0 Renaming bands has been fixed 2016-09-09 21:49:46 +04:00
Arin Alexander
e641215c72 Merge branch 'master' into 1.4 2016-09-05 22:52:21 +04:00
Arin Alexander
264c0921f3 carriage return escaped 2016-09-05 21:36:01 +04:00
Arin Alexander
d3c9661579 Group functions have been fixed 2016-09-05 21:34:12 +04:00
Arin Alexander
74d9494478 Merge branch 'master' into 1.4 2016-08-31 00:16:25 +04:00
Arin Alexander
d8b10e7dfa Thanks to GraninDB! Fix: Set valid grid setting after new page adding 2016-08-31 00:15:56 +04:00
Arin Alexander
f3e633e469 Thanks to GraninDB! Simple fixes for correct moving ang resizing items
with
grid.
2016-08-31 00:15:07 +04:00
Arin Alex
381ef73b84 Text item changing font in preview window has been fixed 2016-08-12 22:01:07 +03:00
Arin Alexander
0a2d906a89 Merge branch 'master' into 1.4
# Conflicts:
#	limereport/lrscriptenginemanager.h
2016-08-12 22:15:50 +04:00
Arin Alexander
71fe049ff4 ScriptEngineManager::addFunction has been fixed 2016-08-12 22:14:05 +04:00
Arin Alex
4370182106 Merge branch 'master' into 1.4
Conflicts:
	limereport/lrpreviewreportwindow.cpp
	limereport/lrpreviewreportwindow.h
	limereport/report.qrc
2016-08-08 15:53:39 +03:00
Arin Alex
1320c6f8ee Spliting band has been fixed 2016-08-08 15:50:44 +03:00
Arin Alex
4970b09327 Show ToolBar action has been added to preview window 2016-08-08 15:50:04 +03:00
Arin Alex
7a1a3ac34a Merge branch 'master' into 1.4 2016-08-02 22:33:43 +03:00
Arin Alex
7ce974090e Fix #46 Allow to customize the Preview dialog
hints (ShowAllPreviewBars, HidePreviewToolBar, HidePreviewMenuBar, HidePreviewStatusBar, HideAllPreviewBar) have been added to preview method
2016-08-02 22:33:33 +03:00
Arin Alex
30c1a954f3 Merge branch 'master' into 1.4 2016-08-02 20:33:11 +03:00
Arin Alex
c52a0240c6 splitting instead changing height 2016-08-02 20:32:52 +03:00
Arin Alex
06e5b1f29a Merge branch 'master' into 1.4
Conflicts:
	limereport/items/lrtextitem.cpp
	limereport/lrreportdesignwidget.cpp
2016-08-02 01:43:05 +03:00