Merge branch 'master' into 1.4

This commit is contained in:
Arin Alex
2016-08-02 22:33:43 +03:00
8 changed files with 45 additions and 8 deletions

View File

@@ -80,6 +80,13 @@ namespace Const{
QString extractClassName(QString className);
enum RenderPass {FirstPass, SecondPass};
enum ArrangeType {AsNeeded, Force};
enum PreviewHint{ShowAllPreviewBars=0,
HidePreviewToolBar=1,
HidePreviewMenuBar=2,
HidePreviewStatusBar=4,
HideAllPreviewBar=7};
Q_DECLARE_FLAGS(PreviewHints, PreviewHint)
class ReportError : public std::runtime_error{
public:
ReportError(const QString& message):std::runtime_error(message.toStdString()){}
@@ -104,6 +111,6 @@ namespace Const{
} // namespace LimeReport
Q_DECLARE_OPERATORS_FOR_FLAGS(LimeReport::PreviewHints)
#endif // GLOBAL_H

View File

@@ -77,7 +77,7 @@ public:
void printToFile(const QString& fileName);
PageDesignIntf *createPreviewScene(QObject *parent = 0);
bool printToPDF(const QString& fileName);
void previewReport();
void previewReport(PreviewHints hints = ShowAllPreviewBars);
void designReport();
void setShowProgressDialog(bool value);
IDataSourceManager* dataManager();