0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-26 09:28:11 +03:00
Commit Graph

618 Commits

Author SHA1 Message Date
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
Arin Alex
da3eb52563 Fix #44 'File > Save As' does not emit saveFinished 2016-08-02 01:39:52 +03:00
Arin Alex
f7d8a5050a Variables access has been fixed 2016-08-02 01:33:56 +03:00
Arin Alex
019d213882 Spliting TextItem and multi variables output have been fixed 2016-08-02 00:38:10 +03:00
Arin Alex
6a1b244104 zOrder fixed for Page and Band 2016-08-02 00:35:57 +03:00
Arin Alex
a2346bc6aa Merge branch 'master' into 1.4
Conflicts:
	limereport/items/lrtextitem.cpp
	limereport/items/lrtextitem.h
2016-07-27 00:44:50 +03:00
Arin Alex
8e632855b4 repeatOnEachRow property has been added to DataHeader 2016-07-27 00:41:24 +03:00
fralx
77f6129c1f Merge pull request #43 from PepaRokos/master
Added support for formating numbers and dates by pattern.
2016-07-26 19:26:57 +03:00
Josef Rokos
88ef131148 Added support for formating numbers and dates by pattern. 2016-07-26 16:01:14 +02:00
Arin Alexander
224c1da1c6 Merge branch 'master' into 1.4 2016-07-25 16:05:54 +03:00
Arin Alexander
db60ee67f1 setVariable function has been added (Thanks to Muthu Samy) 2016-07-25 16:05:40 +03:00
Arin Alexander
faf47cca29 Merge branch 'master' into 1.4 2016-07-25 15:16:32 +03:00
Arin Alexander
30a662db0c Item position Q_INVOKABLE functions have been added 2016-07-25 15:16:21 +03:00
Arin Alexander
6fe3e7cbb4 Merge branch 'master' into 1.4 2016-07-25 14:07:57 +03:00
Arin Alexander
a4ae0c284b Fixed splitting band 2016-07-25 14:07:42 +03:00
Arin Alexander
fe67575691 Merge branch 'master' into 1.4 2016-07-21 00:15:04 +03:00
Arin Alexander
942dc47b8f printAlways has been moved to BandDesignIntf & printAlways property has been added to DataHeaderBand & DataFooterBand 2016-07-21 00:14:39 +03:00
Arin Alexander
c7b0a6d0e1 setItemWidth & setItemHeight invokable functions have been added to BaseDesignIntf 2016-07-21 00:11:19 +03:00
Arin Alexander
378ed68ec1 Merge branch 'master' into 1.4 2016-07-15 11:44:13 +03:00
Arin Alexander
3edd101d52 The bands insertion order has been fixed 2016-07-15 11:30:14 +03:00
Arin Alexander
81d896eecc Merge branch 'master' into 1.4 2016-07-08 10:40:48 +03:00
Arin Alexander
744c6dfe87 dataSourceManager connects queryTextChanged(QString,QString)) after loading query collection 2016-07-08 10:40:26 +03:00
Arin Alex
9243036750 Merge branch 'master' into 1.4 2016-07-07 23:52:51 +03:00
Arin Alex
885cd91daa singnal queryTextChanged(const QString& queryName, const QString& queryText) has been added to QueryDesc
singnal queryTextChanged(const QString& queryName, const QString& queryText) has been added to QueryDesc
2016-07-07 23:52:07 +03:00
Arin Alex
bf6adc13c3 Fix #40 Replace "QStyleOptionViewItemV4" with "QStyleOptionViewItem" 2016-07-07 23:48:03 +03:00
Arin Alex
826e62abe0 Merge branch 'master' into 1.4 2016-06-29 21:38:32 +03:00
Arin Alex
659a2dea00 Fixed writing of variables 2016-06-29 21:24:54 +03:00
Arin Alex
a010c2012f QVariant serializator has been added 2016-06-29 21:22:31 +03:00
Arin Alexander
b55582fad2 Merge branch 'master' into 1.4
# Conflicts:
#	limereport/lrreportengine.cpp
#	limereport/lrreportengine_p.h
2016-06-25 00:33:44 +04:00
Arin Alex
43089b55d6 Fix: #38 Allow to suppress warnings for unknown fields 2016-06-24 23:22:24 +03:00
Arin Alex
ac98da1394 ReportSettings have been added to report items 2016-06-24 23:22:24 +03:00
Arin Alex
779eefcab5 Setting dialog has been modified to edit report settings
Setting dialog has been modified to edit report settings
2016-06-24 23:22:17 +03:00
Arin Alex
a8b193de05 Errors messages have been modified 2016-06-24 23:22:16 +03:00
Arin Alex
d07c44d6bb ReportSetting has been added
ReportSetting has been added
2016-06-24 23:19:34 +03:00
Arin Alexander
9771ffee71 Merge branch 'master' into 1.4 2016-06-25 00:03:35 +04:00
Arin Alex
7311f84b0e Fix: #37 Add possibility to move data bands when having many
Fix: #37 Add possibility to move data bands when having many
2016-06-24 17:47:28 +03:00
Arin Alexander
fecf863f7c Version 1.4 initial commit 2016-06-10 19:05:18 +04:00
Arin Alex
6a507e5b61 Debug output has been removed 2016-06-07 00:52:40 +03:00
Arin Alex
5455b53404 Report variables have been refactored 2016-06-07 00:45:35 +03:00
Arin Alexander
127bb45b7d currencyUSBasedFormat has been added to script engine 2016-06-06 21:36:41 +04:00
Arin Alexander
575fc27563 Fix #34 New function Currency Format 2016-06-01 21:59:29 +04:00
Arin Alexander
b5a6baa78c Fix #36 Copy/Paste from within a band 2016-06-01 20:37:51 +04:00
Arin Alexander
17ca1d142f Fix #35 'Undo' after applying of Horizontal Layout breaks the movement logic 2016-06-01 19:54:10 +04:00
Arin Alexander
d1f33e095b startFromNewPage property has been added to Data band 2016-05-31 15:07:57 +03:00
Arin Alexander
be63934c32 PageItem cutting and deleting has been forbidden 2016-05-30 21:32:55 +04:00
Arin Alexander
de6ce6741f "QMetaProperty::read: Unable to handle unregistered datatype" has been fixed 2016-05-27 02:01:12 +04:00
Arin Alexander
aa6a61cc47 font.bold() --> font.weight() 2016-05-27 01:59:57 +04:00
Arin Alexander
133b1c4054 <QScriptEngine> --> <QtScript/QScriptEngine> 2016-05-27 00:07:27 +04:00
Arin Alexander
9359caaf30 Font stylename property is now saved by XmlFontSerializator 2016-05-27 00:05:33 +04:00
Arin Alexander
d595d76eb2 Availability components check has been added 2016-05-26 23:24:29 +04:00
Arin Alexander
c9d378a927 Generating unique names for page items has been added 2016-05-26 23:21:42 +04:00
Arin Alexander
8d3dd7c09b oldPrintMode property has been added for previous versions compatibility 2016-05-26 23:19:12 +04:00
Arin Alexander
906fff5911 std::abs() --> fabs() 2016-05-20 19:16:14 +04:00
Arin Alexander
ce01b9a9ab MinGW build fixed 2016-05-20 19:16:14 +04:00
Arin Alexander
fdc03900ea Redundant return will be removed from upper part of sliced text 2016-05-17 22:59:41 +04:00
Arin Alexander
fc9e7c792b CheckBox editor has been fixed ( Qt4 ) 2016-05-17 22:54:39 +04:00
Arin Alexander
80f2a135cd Spliting band without AutoHeight has been fixed 2016-05-17 22:52:53 +04:00
Arin Alexander
f3401c4c7e Fix #31 Build error on Windows (CI) 2016-04-25 22:11:25 +03:00
Arin Alexander
c2d2b8293e Fix #32 Ambiguous abs 2016-04-25 21:58:55 +03:00
Arin Alexander
4743cd1fe6 Redundant code has been removed 2016-04-21 18:28:20 +03:00
Arin Alexander
fab352c81c Fix #30 Destroying a report engine does not destroy all it's windows and lead to crash 2016-04-21 17:53:31 +03:00
Arin Alexander
2e4ee6ca05 Fix #28 signal saveFinished has been added 2016-04-21 17:44:58 +03:00
Arin Alexander
cb54963db9 setReportFileName(const QString& fileName) has been added to ReportEngine 2016-04-21 14:58:21 +03:00
Arin Alexander
84953b6847 Show error action in preview window has been fixed 2016-04-21 12:25:16 +03:00
Arin Alexander
8bbdefed20 Item alignment has been fixed 2016-04-21 12:09:28 +03:00
Arin Alexander
1ade5d0666 TextItem will expand datasource in TextItemEditor if parent band has datasource. 2016-04-21 02:15:15 +04:00
Arin Alexander
68d2f64c3c Changing page orientation has been fixed 2016-04-21 01:26:15 +04:00
Arin Alexander
34e114d7a4 FullPage property has been added 2016-04-21 01:26:14 +04:00
Arin Alexander
b770669b64 Object browser has been fixed
Object browser has been fixed
2016-04-21 01:26:07 +04:00
Arin Alexander
fa89f21930 Height calculation has been fixed 2016-04-20 20:59:33 +04:00
Arin Alexander
6a25ac752f Field list for CallbackDatasource in TextItem has been fixed 2016-04-14 00:05:17 +04:00
Arin Alexander
93393186b3 in QAbstractItemModel::setHeaderData() Qt::UserRole can be used for creating language independed tag 2016-04-14 00:05:17 +04:00
Arin Alexander
166a0ac688 allowHTMLInFields property has been added 2016-04-13 13:38:07 +03:00
Arin Alexander
166b18be49 Printing subdetail footer has been fixed 2016-04-12 20:37:47 +04:00
Arin Alexander
43a62bdb7f .pdf extension will be added to filename if filename has no extension 2016-04-07 21:21:48 +04:00
Arin Alex
ed926de523 Finished pages count fixed 2016-04-07 18:57:27 +03:00
Arin Alexander
225ee41289 setPreviewWindowIcon, setPreviewWindowTitle added to LimeReport::ReportEngine 2016-04-06 23:03:58 +04:00
Arin Alexander
bd6e072913 Logo icon added 2016-04-06 23:00:10 +04:00
Arin Alexander
4f5103e679 Minimize button activated 2016-04-06 21:41:50 +04:00
Arin Alexander
eb6e174080 Border color property has been added 2016-04-06 21:35:13 +04:00
Arin Alexander
f67602af43 Variables cleaning on report loading has been added 2016-04-06 01:36:59 +03:00
Arin Alexander
79feedd360 page scale refactored 2016-04-06 00:06:11 +04:00
Arin Alexander
aa3f9d80d3 unnecessary check has been removed 2016-04-05 20:05:14 +04:00
newsages
abea99bd3f simplify DEST_BINS, DEST_LIBS 2016-04-03 15:33:41 +02:00
newsages
1acaa431c4 ARCH_TYPE
unix{
    ARCH_DIR       = $${OUT_PWD}/unix
    ARCH_TYPE      = unix
    macx{
        ARCH_DIR       = $${OUT_PWD}/macx
        ARCH_TYPE      = macx
    }
    linux{
        !contains(QT_ARCH, x86_64){
            message("Compiling for 32bit system")
            ARCH_DIR       = $${OUT_PWD}/linux32
            ARCH_TYPE      = linux32
        }else{
            message("Compiling for 64bit system")
            ARCH_DIR       = $${OUT_PWD}/linux64
            ARCH_TYPE      = linux64
        }
    }
}
win32 {
    ARCH_DIR       = $${OUT_PWD}/win32
    ARCH_TYPE      = win32
}

DESTDIR  = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib

LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib
2016-04-03 15:08:17 +02:00
Arin Alexander
caa516d6bd Scale actions have been added to Report Preview Window 2016-04-02 16:07:01 +03:00
Arin Alex
57e7346e22 Fix build on Linux 2016-04-02 06:03:11 +03:00
Arin Alexander
d3038816ca Fix build on Windows 2016-04-02 06:05:41 +04:00
Arin Alex
b315af26b9 Preview Widget refactored. 2016-04-02 03:38:23 +03:00
Arin Alex
2aec1cfc26 Fixed refresh pages 2016-04-01 23:39:07 +03:00
Arin Alexander
ca1a700b61 Fix build on Windows 2016-04-01 19:46:42 +04:00
Newsages
4665a7e914 DEST_INCLUDE_DIR = $$PWD/include/ to DEST_INCLUDE_DIR = $$PWD/include 2016-03-31 15:42:08 +02:00
Newsages
aeb11d0318 not use end of / on $$VARIABLE_DIR for unix 2016-03-31 15:30:00 +02:00
newsages
54fe767e16 Update limereport.pro 2016-03-31 15:15:55 +02:00
Arin Alexander
9747873db9 lrpreviewreportwidget.h added to EXTRA_FILES 2016-03-31 05:10:04 +04:00
Arin Alexander
6f35c5e2a3 Build on Linux & Mac fixed 2016-03-31 03:55:27 +03:00
Arin Alexander
cfd971cd46 Project structure changed 2016-03-31 03:42:12 +04:00
Arin Alexander
d5a5d73e3f Fix build on Windows 2016-03-31 00:50:22 +04:00
Arin Alexander
cdd46ff863 createPreviewWidget(QWidget* parent=0) method has been added to ReportEngine 2016-03-31 00:50:21 +04:00
Arin Alexander
a7192c350c PreviewReportWindow now uses PreviewReportWidget to show render result 2016-03-31 00:50:21 +04:00
Arin Alexander
9c57bb772f Preview Widget has been added 2016-03-31 00:50:20 +04:00
Arin Alexander
5717900216 Zommer has been moved to own module
Zommer has been moved to own module
2016-03-31 00:50:10 +04:00
newsages
7d6d7d39c8 logical Structure folders 2016-03-27 21:02:58 +02:00
Arin Alexander
9d9f1f4d98 Callback interface has been simplified
From now on if slot getCallbackData(const LimeReport::CallbackInfo& info, QVariant& data) returns row count then there is no more need to implement second slot changePos(const LimeReport::CallbackInfo::ChangePosType& type, bool& result);
2016-03-27 10:40:13 +03:00
Arin Alexander
517bf8357e InputMode propperty has been added to BarcodeItem 2016-03-25 23:46:17 +03:00
Arin Alexander
225e0f6c91 Fix: 64 bit building & band slice 2016-03-25 19:59:44 +03:00
Arin Alexander
2679e0ec07 Fix build on Mac and "/" added to REPORTS_DIR 2016-03-24 15:53:05 +03:00
Arin Alex
96653b0920 Fix build on Linux 2016-03-24 02:37:43 +03:00
Arin Alexander
ab38b435ca One more limereport's project structure changes 2016-03-24 02:18:08 +03:00
Arin Alexander
a5369589e3 Fix build on Qt 4 2016-03-24 02:14:09 +03:00
Arin Alexander
9ad28f1aa6 Multiscreen initial size has been fixed 2016-03-23 14:13:38 +03:00
Arin Alexander
372c677f6f Fix build on Qt 4 2016-03-22 22:58:18 +03:00
Arin Alexander
0550654b04 Some limereport's project structure changes 2016-03-22 15:55:02 +03:00
Arin Alexander
36c9b060a9 Merge branch 'pr/19' 2016-03-22 13:44:32 +03:00
newsages
598d4f10ed Change to subforder project model. 2016-03-21 02:12:30 +01:00