Finish 1.4.86

# Conflicts:
#	include/lrpreviewreportwidget.h
#	include/lrreportengine.h
#	limereport/lrpreviewreportwidget.cpp
#	limereport/lrpreviewreportwidget.h
#	limereport/lrreportengine.cpp
#	limereport/lrreportengine.h
#	limereport/lrreportengine_p.h

include/lrglobal.h

@@ -106,6 +106,7 @@ namespace Const{
     enum ExpandType {EscapeSymbols, NoEscapeSymbols, ReplaceHTMLSymbols};
     enum RenderPass {FirstPass = 1, SecondPass = 2};
     enum ArrangeType {AsNeeded, Force};
+    enum ScaleType {FitWidth, FitPage, OneToOne, Percents};
     enum PreviewHint{ShowAllPreviewBars = 0,
                      HidePreviewToolBar = 1,
                      HidePreviewMenuBar = 2,

include/lrpreviewreportwidget.h

@@ -2,6 +2,7 @@
 #define LRPREVIEWREPORTWIDGET_H
 
 #include <QWidget>
+#include <QTimer>
 #include "lrglobal.h"
 
 namespace LimeReport {
@@ -25,6 +26,9 @@ public:
     ~PreviewReportWidget();
     QList<QString> aviableExporters();
     bool exportReport(QString exporterName, const QMap<QString, QVariant>& params = QMap<QString, QVariant>());
+    ScaleType scaleType() const;
+    int  scalePercent() const;
+    void setScaleType(const ScaleType &scaleType, int percent = 0);
 public slots:
     void refreshPages();
     void zoomIn();
@@ -42,6 +46,8 @@ public slots:
     void setScalePercent(int percent);
     void fitWidth();
     void fitPage();
+protected:
+    void resizeEvent(QResizeEvent *);
 signals:
     void pageChanged(int page);
     void scalePercentChanged(int percent);
@@ -50,6 +56,7 @@ private slots:
     void slotSliderMoved(int value);
     void reportEngineDestroyed(QObject* object);
     void slotZoomed(double);
+    void resizeDone();
 private:
     void initPreview();
     void setErrorsMesagesVisible(bool visible);
@@ -58,6 +65,9 @@ private:
 private:
     Ui::PreviewReportWidget *ui;
     PreviewReportWidgetPrivate* d_ptr;
+    ScaleType m_scaleType;
+    int       m_scalePercent;
+    QTimer m_resizeTimer;
 };
 
 } // namespace LimeReport

include/lrreportengine.h

@@ -116,6 +116,9 @@ public:
     void setPreviewLayoutDirection(const Qt::LayoutDirection& previewLayoutDirection);
     QList<QLocale::Language> designerLanguages();
     QLocale::Language currentDesignerLanguage();
+    ScaleType previewScaleType();
+    int  previewScalePercent();
+    void setPreviewScaleType(const ScaleType &previewScaleType, int percent = 0);
 signals:
     void cleared();
     void renderStarted();