mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-01-11 17:18:10 +03:00
Code

Finish 1.5.2

Browse Source
This commit is contained in:
Arin Alexander 2019-07-09 12:35:49 +03:00
commit 425365a49d
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

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

3
designer/designersettingmanager.cpp
View File

@ -15,10 +15,11 @@ void DesignerSettingManager::getAvailableLanguages(QList<QLocale::Language>* lan
{ {
languages->append(QLocale::Russian); languages->append(QLocale::Russian);
languages->append(QLocale::English); languages->append(QLocale::English);
languages->append(QLocale::Arabic); // languages->append(QLocale::Arabic);
languages->append(QLocale::French); languages->append(QLocale::French);
languages->append(QLocale::Chinese); languages->append(QLocale::Chinese);
languages->append(QLocale::Spanish); languages->append(QLocale::Spanish);
languages->append(QLocale::Polish);
} }
QLocale::Language DesignerSettingManager::getCurrentDefaultLanguage() QLocale::Language DesignerSettingManager::getCurrentDefaultLanguage()

1
designer/designersettingmanager.h
View File

@ -12,7 +12,6 @@ class DesignerSettingManager : public QObject
public: public:
explicit DesignerSettingManager(QObject *parent = 0); explicit DesignerSettingManager(QObject *parent = 0);
~DesignerSettingManager(); ~DesignerSettingManager();
void setApplicationInstance(QApplication* application);
public slots: public slots:
void getAvailableLanguages(QList<QLocale::Language>* languages); void getAvailableLanguages(QList<QLocale::Language>* languages);
QLocale::Language getCurrentDefaultLanguage(); QLocale::Language getCurrentDefaultLanguage();

2
limereport/lrdatadesignintf.h
View File

@ -176,7 +176,7 @@ public:
bool isOwned() const {return true;} bool isOwned() const {return true;}
bool isEditable() const {return true;} bool isEditable() const {return true;}
bool isRemovable() 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 update(){ updateModel(); }
void clearErrors(){} void clearErrors(){}
private: private:

9
limereport/lrpreviewreportwindow.cpp
View File

@ -189,6 +189,10 @@ void PreviewReportWindow::setMenuVisible(bool value)
void PreviewReportWindow::setHideResultEditButton(bool value) void PreviewReportWindow::setHideResultEditButton(bool value)
{ {
ui->actionEdit_Mode->setVisible(value); ui->actionEdit_Mode->setVisible(value);
if (!value && ui->editModeTools) {
delete ui->editModeTools;
ui->editModeTools = 0;
}
} }
void PreviewReportWindow::setHidePrintButton(bool value) void PreviewReportWindow::setHidePrintButton(bool value)
@ -292,7 +296,8 @@ void PreviewReportWindow::moveEvent(QMoveEvent* e)
void PreviewReportWindow::showEvent(QShowEvent *) void PreviewReportWindow::showEvent(QShowEvent *)
{ {
m_fontEditor->setVisible(ui->actionEdit_Mode->isChecked()); 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()); m_textAlignmentEditor->setVisible(ui->actionEdit_Mode->isChecked());
switch (m_previewScaleType) { switch (m_previewScaleType) {
case FitWidth: case FitWidth:
@ -500,7 +505,7 @@ void PreviewReportWindow::on_actionShow_Toolbar_triggered()
writeSetting(); writeSetting();
} }
void PreviewReportWindow::slotCurrentPageChanged(int page) void PreviewReportWindow::slotCurrentPageChanged(int /*page*/)
{ {
slotActivateItemSelectionMode(); slotActivateItemSelectionMode();
} }

4
limereport/lrpreviewreportwindow.ui
View File

@ -60,7 +60,7 @@
<widget class="QStatusBar" name="statusbar"/> <widget class="QStatusBar" name="statusbar"/>
<widget class="QToolBar" name="toolBar"> <widget class="QToolBar" name="toolBar">
<property name="windowTitle"> <property name="windowTitle">
<string>toolBar</string> <string>MainToolBar</string>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
@ -98,7 +98,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>toolBar_2</string> <string>EditModeTools</string>
</property> </property>
<attribute name="toolBarArea"> <attribute name="toolBarArea">
<enum>LeftToolBarArea</enum> <enum>LeftToolBarArea</enum>