Merge branch 'master' into 1.4

include/lrglobal.h

@@ -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

include/lrreportengine.h

@@ -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();

limereport/lrglobal.h

@@ -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

limereport/lrpreviewreportwindow.cpp

@@ -149,6 +149,21 @@ void PreviewReportWindow::setErrorMessages(const QStringList &value){
     m_previewReportWidget->setErrorMessages(value);
 }
 
+void PreviewReportWindow::setToolBarVisible(bool value)
+{
+    ui->toolBar->setVisible(value);
+}
+
+void PreviewReportWindow::setStatusBarVisible(bool value)
+{
+    ui->statusbar->setVisible(value);
+}
+
+void PreviewReportWindow::setMenuVisible(bool value)
+{
+    ui->menubar->setVisible(value);
+}
+
 QSettings*PreviewReportWindow::settings()
 {
     if (m_settings){

limereport/lrpreviewreportwindow.h

@@ -62,6 +62,9 @@ public:
     void initPreview(int pagesCount);
     void setSettings(QSettings* value);
     void setErrorMessages(const QStringList& value);
+    void setToolBarVisible(bool value);
+    void setStatusBarVisible(bool value);
+    void setMenuVisible(bool value);
     QSettings* settings();
 protected:
     void writeSetting();

limereport/lrreportengine.cpp

@@ -355,7 +355,7 @@ bool ReportEnginePrivate::printToPDF(const QString &fileName)
     return false;
 }
 
-void ReportEnginePrivate::previewReport()
+void ReportEnginePrivate::previewReport(PreviewHints hints)
 { 
     QTime start = QTime::currentTime();
     try{
@@ -375,6 +375,11 @@ void ReportEnginePrivate::previewReport()
             if (!dataManager()->errorsList().isEmpty()){
                 w->setErrorMessages(dataManager()->errorsList());
             }
+
+            w->setMenuVisible(!hints.testFlag(HidePreviewMenuBar));
+            w->setStatusBarVisible(!hints.testFlag(HidePreviewStatusBar));
+            w->setToolBarVisible(!hints.testFlag(HidePreviewToolBar));
+
             m_activePreview = w;
             connect(w,SIGNAL(destroyed(QObject*)), this, SLOT(slotPreviewWindowDestroed(QObject*)));
             qDebug()<<"render time ="<<start.msecsTo(QTime::currentTime());
@@ -720,12 +725,12 @@ bool ReportEngine::printToPDF(const QString &fileName)
     return d->printToPDF(fileName);
 }
 
-void ReportEngine::previewReport()
+void ReportEngine::previewReport(PreviewHints hints)
 {
     Q_D(ReportEngine);
     if (m_settings)
         d->setSettings(m_settings);
-    d->previewReport();
+    d->previewReport(hints);
 }
 
 void ReportEngine::designReport()

limereport/lrreportengine.h

@@ -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();

limereport/lrreportengine_p.h

@@ -86,7 +86,7 @@ public:
     bool    printPages(ReportPages pages, QPrinter *printer, PrintRange printRange = PrintRange());
     void    printToFile(const QString& fileName);
     bool    printToPDF(const QString& fileName);
-    void    previewReport();
+    void    previewReport(PreviewHints hints = ShowAllPreviewBars);
     void    designReport();
     void    setSettings(QSettings* value);
     void    setShowProgressDialog(bool value){m_showProgressDialog = value;}