Finish 1.5.2

2024-12-24 12:34:39 +03:00 · 2019-07-09 12:35:50 +03:00 · 2019-07-09 12:35:50 +03:00 · ad8d7d90e6
commit ad8d7d90e6
parent d69873e511 4fb39eaf35
8 changed files with 973 additions and 460 deletions
--- a/common.pri
+++ b/common.pri
@ -127,7 +127,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc

 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 5
-LIMEREPORT_VERSION_RELEASE = 1
+LIMEREPORT_VERSION_RELEASE = 2

 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
 DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
--- a/designer/designersettingmanager.cpp
+++ b/designer/designersettingmanager.cpp
@ -15,10 +15,11 @@ void DesignerSettingManager::getAvailableLanguages(QList<QLocale::Language>* lan
 {
    languages->append(QLocale::Russian);
    languages->append(QLocale::English);
-    languages->append(QLocale::Arabic);
+//    languages->append(QLocale::Arabic);
    languages->append(QLocale::French);
    languages->append(QLocale::Chinese);
    languages->append(QLocale::Spanish);
+    languages->append(QLocale::Polish);
 }

 QLocale::Language DesignerSettingManager::getCurrentDefaultLanguage()
--- a/designer/designersettingmanager.h
+++ b/designer/designersettingmanager.h
@ -12,7 +12,6 @@ class DesignerSettingManager : public QObject
 public:
    explicit DesignerSettingManager(QObject *parent = 0);
    ~DesignerSettingManager();
-    void setApplicationInstance(QApplication* application);
 public slots:
    void getAvailableLanguages(QList<QLocale::Language>* languages);
    QLocale::Language getCurrentDefaultLanguage();
--- a/limereport/lrdatadesignintf.h
+++ b/limereport/lrdatadesignintf.h
@ -176,7 +176,7 @@ public:
    bool isOwned() const {return true;}
    bool isEditable() const {return true;}
    bool isRemovable() const {return true;}
-    void invalidate(IDataSource::DatasourceMode mode, bool dbWillBeClosed){ updateModel();}
+    void invalidate(IDataSource::DatasourceMode mode, bool /*dbWillBeClosed*/){ updateModel();}
    void update(){ updateModel(); }
    void clearErrors(){}
 private:
--- a/limereport/lrpreviewreportwindow.cpp
+++ b/limereport/lrpreviewreportwindow.cpp
@ -189,6 +189,10 @@ void PreviewReportWindow::setMenuVisible(bool value)
 void PreviewReportWindow::setHideResultEditButton(bool value)
 {
    ui->actionEdit_Mode->setVisible(value);
+    if (!value && ui->editModeTools) {
+        delete ui->editModeTools;
+        ui->editModeTools = 0;
+    }
 }

 void PreviewReportWindow::setHidePrintButton(bool value)
@ -292,7 +296,8 @@ void PreviewReportWindow::moveEvent(QMoveEvent* e)
 void PreviewReportWindow::showEvent(QShowEvent *)
 {
    m_fontEditor->setVisible(ui->actionEdit_Mode->isChecked());
-    ui->editModeTools->setVisible(false);
+    if (ui->editModeTools)
+        ui->editModeTools->setVisible(false);
    m_textAlignmentEditor->setVisible(ui->actionEdit_Mode->isChecked());
    switch (m_previewScaleType) {
    case FitWidth:
@ -500,7 +505,7 @@ void PreviewReportWindow::on_actionShow_Toolbar_triggered()
    writeSetting();
 }

-void PreviewReportWindow::slotCurrentPageChanged(int page)
+void PreviewReportWindow::slotCurrentPageChanged(int /*page*/)
 {
    slotActivateItemSelectionMode();
 }
--- a/limereport/lrpreviewreportwindow.ui
+++ b/limereport/lrpreviewreportwindow.ui
@ -60,7 +60,7 @@
  <widget class="QStatusBar" name="statusbar"/>
  <widget class="QToolBar" name="toolBar">
   <property name="windowTitle">
-    <string>toolBar</string>
+    <string>MainToolBar</string>
   </property>
   <property name="iconSize">
    <size>
@ -98,7 +98,7 @@
    <bool>true</bool>
   </property>
   <property name="windowTitle">
-    <string>toolBar_2</string>
+    <string>EditModeTools</string>
   </property>
   <attribute name="toolBarArea">
    <enum>LeftToolBarArea</enum>
--- a/translations/limereport_fr.ts
+++ b/translations/limereport_fr.ts
--- a/translations/limereport_zh.ts
+++ b/translations/limereport_zh.ts
@ -388,16 +388,16 @@ p, li { white-space: pre-wrap; }
        <translation>保持底部距离</translation>
    </message>
    <message>
-        <source>Start from new page</source>
-        <translation>从新页开始</translation>
+        <source>Cut</source>
+        <translation>剪切</translation>
    </message>
    <message>
-        <source>Start new page</source>
-        <translation>开始新页</translation>
+        <source>Copy</source>
+        <translation>复制</translation>
    </message>
    <message>
-        <source>Keep top space</source>
-        <translation>保持顶部距离</translation>
+        <source>Print if empty</source>
+        <translation>为空时打印</translation>
    </message>
 </context>
 <context>
@ -434,6 +434,14 @@ p, li { white-space: pre-wrap; }
        <source>Create Horizontal Layout</source>
        <translation>创建水平布局</translation>
    </message>
+    <message>
+        <source>Lock item geometry</source>
+        <translation>锁定组件形状</translation>
+    </message>
+    <message>
+        <source>Create Vertical Layout</source>
+        <translation>创建水平布局</translation>
+    </message>
 </context>
 <context>
    <name>LimeReport::ConnectionDesc</name>
@ -539,6 +547,26 @@ p, li { white-space: pre-wrap; }
        <source>Use alternate background color</source>
        <translation>使用交替背景色</translation>
    </message>
+    <message>
+        <source>Keep footer together</source>
+        <translation>保持页脚</translation>
+    </message>
+    <message>
+        <source>Keep subdetail together</source>
+        <translation>保持子细节脚</translation>
+    </message>
+    <message>
+        <source>Slice last row</source>
+        <translation>分割末行</translation>
+    </message>
+    <message>
+        <source>Start from new page</source>
+        <translation>从新页开始</translation>
+    </message>
+    <message>
+        <source>Start new page</source>
+        <translation>开始新页</translation>
+    </message>
 </context>
 <context>
    <name>LimeReport::DataBrowser</name>
@ -633,6 +661,10 @@ p, li { white-space: pre-wrap; }
        <source>DataFooter</source>
        <translation>数据带脚</translation>
    </message>
+    <message>
+        <source>Print always</source>
+        <translation>始终打印</translation>
+    </message>
 </context>
 <context>
    <name>LimeReport::DataHeaderBand</name>
@ -640,6 +672,18 @@ p, li { white-space: pre-wrap; }
        <source>DataHeader</source>
        <translation>数据带头</translation>
    </message>
+    <message>
+        <source>Reprint on each page</source>
+        <translation>重新打印每页</translation>
+    </message>
+    <message>
+        <source>Repeat on each row</source>
+        <translation>每行重复</translation>
+    </message>
+    <message>
+        <source>Print always</source>
+        <translation>始终打印</translation>
+    </message>
 </context>
 <context>
    <name>LimeReport::DataSourceManager</name>
@ -671,6 +715,10 @@ p, li { white-space: pre-wrap; }
        <source>invalid connection</source>
        <translation>无效连接</translation>
    </message>
+    <message>
+        <source>Unknown parameter &quot;%1&quot; for variable &quot;%2&quot; found!</source>
+        <translation>变量&quot;%2&quot;参数&quot;%1&quot;未知!</translation>
+    </message>
 </context>
 <context>
    <name>LimeReport::DataSourceModel</name>
@ -944,6 +992,30 @@ p, li { white-space: pre-wrap; }
        <source>TitleAlignCenter</source>
        <translation>标题居中</translation>
    </message>
+    <message>
+        <source>Layout</source>
+        <translation>布局</translation>
+    </message>
+    <message>
+        <source>Table</source>
+        <translation>表</translation>
+    </message>
+    <message>
+        <source>Millimeters</source>
+        <translation>毫米</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation>英寸</translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation>比例</translation>
+    </message>
+    <message>
+        <source>Split</source>
+        <translation>划分</translation>
+    </message>
 </context>
 <context>
    <name>LimeReport::FlagsPropItem</name>
@ -969,7 +1041,7 @@ p, li { white-space: pre-wrap; }
    </message>
    <message>
        <source>AllLines</source>
-        <translation type="unfinished"></translation>
+        <translation>所有边框</translation>
    </message>
 </context>
 <context>
@ -1061,6 +1133,10 @@ p, li { white-space: pre-wrap; }
        <source>Watermark</source>
        <translation>水印</translation>
    </message>
+    <message>
+        <source>Ext.</source>
+        <translation>扩展名.</translation>
+    </message>
 </context>
 <context>
    <name>LimeReport::ItemLocationPropItem</name>
@ -1168,6 +1244,28 @@ p, li { white-space: pre-wrap; }
        <translation>对象</translation>
    </message>
 </context>
+<context>
+    <name>LimeReport::ObjectInspectorWidget</name>
+    <message>
+        <source>Clear</source>
+        <translation>清除</translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation>筛选</translation>
+    </message>
+    <message>
+        <source>Translate properties</source>
+        <translation>翻译属性</translation>
+    </message>
+</context>
+<context>
+    <name>LimeReport::PDFExporter</name>
+    <message>
+        <source>Export to PDF</source>
+        <translation>导出为PDF文件</translation>
+    </message>
+</context>
 <context>
    <name>LimeReport::PageFooter</name>
    <message>
@ -1219,14 +1317,14 @@ p, li { white-space: pre-wrap; }
        <source>Form</source>
        <translation>表格</translation>
    </message>
-    <message>
-        <source>PDF file name</source>
-        <translation>PDF 文件名</translation>
-    </message>
    <message>
        <source>Report file name</source>
        <translation>报表文件名</translation>
    </message>
+    <message>
+        <source>%1 file name</source>
+        <translation>文件名 %1</translation>
+    </message>
 </context>
 <context>
    <name>LimeReport::PreviewReportWindow</name>
@ -1342,6 +1440,30 @@ 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>
+    </message>
+    <message>
+        <source>Add new TextItem</source>
+        <translation>新增文本组件</translation>
+    </message>
+    <message>
+        <source>Selection Mode</source>
+        <translation>选择模式</translation>
+    </message>
+    <message>
+        <source>Delete Item</source>
+        <translation>删除组件</translation>
+    </message>
+    <message>
+        <source>Del</source>
+        <translation>删除</translation>
+    </message>
 </context>
 <context>
    <name>LimeReport::ProxyHolder</name>
@ -1806,15 +1928,63 @@ p, li { white-space: pre-wrap; }
    </message>
    <message>
        <source>printable</source>
-        <translation type="unfinished"></translation>
+        <translation>可打印</translation>
    </message>
    <message>
        <source>variable</source>
-        <translation type="unfinished"></translation>
+        <translation>变量</translation>
+    </message>
+    <message>
+        <source>replaceCRwithBR</source>
+        <translation>替换回车换行</translation>
+    </message>
+    <message>
+        <source>hideIfEmpty</source>
+        <translation>为空时打印</translation>
+    </message>
+    <message>
+        <source>hideEmptyItems</source>
+        <translation>隐藏空组件</translation>
+    </message>
+    <message>
+        <source>useExternalPainter</source>
+        <translation>使用外部绘图</translation>
+    </message>
+    <message>
+        <source>layoutSpacing</source>
+        <translation>布局间距</translation>
+    </message>
+    <message>
+        <source>printerName</source>
+        <translation>打印机名称</translation>
+    </message>
+    <message>
+        <source>fontLetterSpacing</source>
+        <translation>字母间距</translation>
+    </message>
+    <message>
+        <source>hideText</source>
+        <translation>隐藏文本</translation>
+    </message>
+    <message>
+        <source>option3</source>
+        <translation>选项3</translation>
+    </message>
+    <message>
+        <source>units</source>
+        <translation>单位</translation>
+    </message>
+    <message>
+        <source>geometryLocked</source>
+        <translation>形状锁定</translation>
+    </message>
+    <message>
+        <source>printBehavior</source>
+        <translation>打印行为</translation>
    </message>
 </context>
 <context>
-    <name>LimeReport::RectMMPropItem</name>
+    <name>LimeReport::RectPropItem</name>
    <message>
        <source>width</source>
        <translation>宽</translation>
@ -1825,7 +1995,7 @@ p, li { white-space: pre-wrap; }
    </message>
 </context>
 <context>
-    <name>LimeReport::RectPropItem</name>
+    <name>LimeReport::RectUnitPropItem</name>
    <message>
        <source>width</source>
        <translation>宽</translation>
@ -1870,7 +2040,7 @@ p, li { white-space: pre-wrap; }
    </message>
    <message>
        <source>Delete Report Page</source>
-        <translation>删除也</translation>
+        <translation>删除页</translation>
    </message>
    <message>
        <source>Edit Mode</source>
@ -1926,7 +2096,7 @@ p, li { white-space: pre-wrap; }
    </message>
    <message>
        <source>Delete item</source>
-        <translation>删除组建</translation>
+        <translation>删除组件</translation>
    </message>
    <message>
        <source>Zoom In</source>
@ -2132,6 +2302,22 @@ p, li { white-space: pre-wrap; }
        <source>Dialog Designer Tools</source>
        <translation>对话框设计工具</translation>
    </message>
+    <message>
+        <source>Vertical layout</source>
+        <translation>水平布局</translation>
+    </message>
+    <message>
+        <source>Lock selected items</source>
+        <translation>锁定选定组件</translation>
+    </message>
+    <message>
+        <source>Unlock selected items</source>
+        <translation>解锁选定组件</translation>
+    </message>
+    <message>
+        <source>Select one level items</source>
+        <translation>选择一级组件</translation>
+    </message>
 </context>
 <context>
    <name>LimeReport::ReportEnginePrivate</name>
@ -2163,6 +2349,10 @@ This preview is no longer valid.</source>
        <source>Language %1 already exists</source>
        <translation>语言 %1 已存在</translation>
    </message>
+    <message>
+        <source>%1 file name</source>
+        <translation>文件名 %1</translation>
+    </message>
 </context>
 <context>
    <name>LimeReport::ReportFooter</name>
@ -2299,6 +2489,22 @@ This preview is no longer valid.</source>
        <source>Refresh</source>
        <translation>刷新</translation>
    </message>
+    <message>
+        <source>CSV</source>
+        <translation>CSV</translation>
+    </message>
+    <message>
+        <source>Separator</source>
+        <translation>分隔符</translation>
+    </message>
+    <message>
+        <source>;</source>
+        <translation>；</translation>
+    </message>
+    <message>
+        <source>Use first row as header</source>
+        <translation>第一行为头</translation>
+    </message>
 </context>
 <context>
    <name>LimeReport::ScriptBrowser</name>
@ -2413,7 +2619,7 @@ This preview is no longer valid.</source>
    </message>
    <message>
        <source>DATE&amp;TIME</source>
-        <translation>日期时间</translation>
+        <translation>日期&amp;时间</translation>
    </message>
    <message>
        <source>CurrencySymbol</source>
@ -2471,6 +2677,10 @@ This preview is no longer valid.</source>
        <source>datasourceName</source>
        <translation>数据源名称</translation>
    </message>
+    <message>
+        <source>RowIndex</source>
+        <translation>行索引</translation>
+    </message>
 </context>
 <context>
    <name>LimeReport::SettingDialog</name>
@ -2478,10 +2688,6 @@ This preview is no longer valid.</source>
        <source>Designer setting</source>
        <translation>设计器设置</translation>
    </message>
-    <message>
-        <source>Designer Setting</source>
-        <translation>设计器设置</translation>
-    </message>
    <message>
        <source>Default font</source>
        <translation>默认字体</translation>
@ -2498,10 +2704,6 @@ This preview is no longer valid.</source>
        <source>Horizontal grid step</source>
        <translation>横栅格</translation>
    </message>
-    <message>
-        <source>Report Setting</source>
-        <translation>报表设置</translation>
-    </message>
    <message>
        <source>Suppress absent fields and variables warning</source>
        <translation>抑制缺失字段及变量警告</translation>
@ -2511,8 +2713,32 @@ This preview is no longer valid.</source>
        <translation>语言</translation>
    </message>
    <message>
-        <source>Use dark theme</source>
-        <translation>使用暗色主题</translation>
+        <source>Designer settings</source>
+        <translation>设计器设置</translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation>主题</translation>
+    </message>
+    <message>
+        <source>Report units</source>
+        <translation>报表单位</translation>
+    </message>
+    <message>
+        <source>Script editor settings</source>
+        <translation>脚本编辑器设置</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation>字体</translation>
+    </message>
+    <message>
+        <source>Indent size</source>
+        <translation>缩进尺寸</translation>
+    </message>
+    <message>
+        <source>Report settings</source>
+        <translation>报表设置</translation>
    </message>
 </context>
 <context>
@ -2605,6 +2831,10 @@ This preview is no longer valid.</source>
        <source>Watermark</source>
        <translation>水印</translation>
    </message>
+    <message>
+        <source>Hide if empty</source>
+        <translation>为空时隐藏</translation>
+    </message>
 </context>
 <context>
    <name>LimeReport::TextItemEditor</name>
@ -2616,18 +2846,6 @@ This preview is no longer valid.</source>
        <source>Content</source>
        <translation>内容</translation>
    </message>
-    <message>
-        <source>Editor settings</source>
-        <translation>编辑器设置</translation>
-    </message>
-    <message>
-        <source>Editor font</source>
-        <translation>编辑器字体</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation></translation>
-    </message>
    <message>
        <source>Ok</source>
        <translation>确定</translation>
@ -2929,5 +3147,41 @@ This preview is no longer valid.</source>
        <source>Datasource manager not found</source>
        <translation>数据源管理器未找到</translation>
    </message>
+    <message>
+        <source>Export to PDF</source>
+        <translation>导出为PDF文件</translation>
+    </message>
+    <message>
+        <source>VLayout</source>
+        <translation>水平布局</translation>
+    </message>
+    <message>
+        <source>Dark</source>
+        <translation>暗</translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation>亮</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>默认</translation>
+    </message>
+    <message>
+        <source>Millimeters</source>
+        <translation>毫米</translation>
+    </message>
+    <message>
+        <source>Inches</source>
+        <translation>英寸</translation>
+    </message>
+    <message>
+        <source>margin</source>
+        <translation>边距</translation>
+    </message>
+    <message>
+        <source>&apos;&apos;</source>
+        <translation>&apos;&apos;</translation>
+    </message>
 </context>
 </TS>