Merge tag '1.5.22' into develop

Finish 1.5.22

common.pri

@@ -128,7 +128,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 5
-LIMEREPORT_VERSION_RELEASE = 21
+LIMEREPORT_VERSION_RELEASE = 22
 
 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
 DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

limereport/items/lrchartitem.cpp

@@ -249,6 +249,11 @@ QWidget *ChartItem::defaultEditor()
     return editor;
 }
 
+bool ChartItem::isNeedUpdateSize(RenderPass pass) const
+{
+    return  pass == FirstPass;
+}
+
 QList<QString> ChartItem::labels() const
 {
     return m_labels;

limereport/items/lrchartitem.h

@@ -196,7 +196,7 @@ protected:
     void updateItemSize(DataSourceManager *dataManager, RenderPass, int);
     void fillLabels(IDataSource* dataSource);
     QWidget* defaultEditor();
-
+    bool isNeedUpdateSize(RenderPass pass) const;
 private:
     QList<SeriesItem*> m_series;
 //    QList< QPointer<SeriesItem> > m_series;

translations/limereport_zh.ts

@@ -55,6 +55,29 @@
         <translation>系列名称</translation>
     </message>
 </context>
+<context>
+    <name>ImageItemEditor</name>
+    <message>
+        <source>Image Item Editor</source>
+        <translation>图像组件编辑</translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation>图像</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <source>Resource path</source>
+        <translation>资源路径</translation>
+    </message>
+    <message>
+        <source>Select image file</source>
+        <translation>选择图像文件</translation>
+    </message>
+</context>
 <context>
     <name>LRVariableDialog</name>
     <message>
@@ -399,6 +422,10 @@ p, li { white-space: pre-wrap; }
         <source>Print if empty</source>
         <translation>为空时打印</translation>
     </message>
+    <message>
+        <source>Keep top space</source>
+        <translation>保持顶部距离</translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::BaseDesignIntf</name>
@@ -1137,6 +1164,10 @@ p, li { white-space: pre-wrap; }
         <source>Ext.</source>
         <translation>扩展名.</translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation>编辑</translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::ItemLocationPropItem</name>
@@ -1340,10 +1371,6 @@ p, li { white-space: pre-wrap; }
         <source>Report</source>
         <translation>报表</translation>
     </message>
-    <message>
-        <source>toolBar</source>
-        <translation>工具栏</translation>
-    </message>
     <message>
         <source>Print</source>
         <translation>打印</translation>
@@ -1440,10 +1467,6 @@ p, li { white-space: pre-wrap; }
         <source> of %1</source>
         <translation> / %1</translation>
     </message>
-    <message>
-        <source>toolBar_2</source>
-        <translation>工具条</translation>
-    </message>
     <message>
         <source>InsertTextItem</source>
         <translation>插入文本组件</translation>
@@ -1464,6 +1487,26 @@ p, li { white-space: pre-wrap; }
         <source>Del</source>
         <translation>删除</translation>
     </message>
+    <message>
+        <source>MainToolBar</source>
+        <translation>工具条</translation>
+    </message>
+    <message>
+        <source>EditModeTools</source>
+        <translation>编辑工具</translation>
+    </message>
+    <message>
+        <source>Printing</source>
+        <translation>正在打印</translation>
+    </message>
+    <message>
+        <source>Attention</source>
+        <translation>注意</translation>
+    </message>
+    <message>
+        <source>The printing is in process</source>
+        <translation>打印正在处理</translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::ProxyHolder</name>
@@ -1982,6 +2025,10 @@ p, li { white-space: pre-wrap; }
         <source>printBehavior</source>
         <translation>打印行为</translation>
     </message>
+    <message>
+        <source>shiftItems</source>
+        <translation>偏移组件</translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::RectPropItem</name>
@@ -2250,18 +2297,6 @@ p, li { white-space: pre-wrap; }
         <source>Report file name</source>
         <translation>报表文件名</translation>
     </message>
-    <message>
-        <source>Rendering report</source>
-        <translation>生成报表</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>关于</translation>
-    </message>
-    <message>
-        <source> page rendered</source>
-        <translation> 报表生成</translation>
-    </message>
     <message>
         <source>Warning</source>
         <translation>警告</translation>
@@ -2318,6 +2353,22 @@ p, li { white-space: pre-wrap; }
         <source>Select one level items</source>
         <translation>选择一级组件</translation>
     </message>
+    <message>
+        <source>Rendered %1 pages</source>
+        <translation>已处理%1页</translation>
+    </message>
+    <message>
+        <source>Cancel report rendering</source>
+        <translation>取消打印</translation>
+    </message>
+    <message>
+        <source>Attention</source>
+        <translation>注意</translation>
+    </message>
+    <message>
+        <source>The rendering is in process</source>
+        <translation>正在处理中</translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::ReportEnginePrivate</name>