diff --git a/common.pri b/common.pri index a0012c5..e6a988c 100644 --- 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}\\\" diff --git a/designer/designersettingmanager.cpp b/designer/designersettingmanager.cpp index 550772e..f523c6c 100644 --- a/designer/designersettingmanager.cpp +++ b/designer/designersettingmanager.cpp @@ -15,10 +15,11 @@ void DesignerSettingManager::getAvailableLanguages(QList* 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() diff --git a/designer/designersettingmanager.h b/designer/designersettingmanager.h index 4c1d28c..e1226fe 100644 --- 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* languages); QLocale::Language getCurrentDefaultLanguage(); diff --git a/limereport/lrdatadesignintf.h b/limereport/lrdatadesignintf.h index 8665bc1..38b9207 100644 --- 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: diff --git a/limereport/lrpreviewreportwindow.cpp b/limereport/lrpreviewreportwindow.cpp index 2f6f391..ee00a86 100644 --- 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(); } diff --git a/limereport/lrpreviewreportwindow.ui b/limereport/lrpreviewreportwindow.ui index 8ce8873..3db023f 100644 --- a/limereport/lrpreviewreportwindow.ui +++ b/limereport/lrpreviewreportwindow.ui @@ -60,7 +60,7 @@ - toolBar + MainToolBar @@ -98,7 +98,7 @@ true - toolBar_2 + EditModeTools LeftToolBarArea