0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-23 16:22:58 +03:00
Commit Graph

270 Commits

Author SHA1 Message Date
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
30f991a2ac Merge branch 'master' into 1.4 2016-07-21 12:49:01 +03:00
Arin Alexander
5001738d76 Designer project has been added
Designer project has been added
2016-07-21 12:48:22 +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
5c6e55728f Merge branch 'master' into 1.4 2016-07-08 00:03:19 +03:00
Arin Alex
8b77433ab3 Demo report has been changed 2016-07-08 00:03:07 +03:00
Arin Alex
12774b51ea Merge remote-tracking branch 'origin/1.4' into 1.4 2016-07-07 23:53:31 +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 Alexander
65031503cd Merge branch 'master' into 1.4 2016-07-06 12:20:34 +03:00
Arin Alex
692e941bbb travis build: ppa:beineri/opt-qt56-trusty --> ppa:beineri/opt-qt561-trusty 2016-06-29 23:24:04 +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