mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-03-14 14:23:50 +03:00
Code

Designer updated

Browse Source
This commit is contained in:
Arin Alexander 2018-05-24 14:31:10 +03:00
parent 86eb804e3a
commit 56e78f86ba
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
designer/designer.pro
View File

@ -8,6 +8,9 @@ contains(CONFIG,release) {
} }
TEMPLATE = app TEMPLATE = app
HEADERS += \
designersettingmanager.h
SOURCES += main.cpp \ SOURCES += main.cpp \
designersettingmanager.cpp designersettingmanager.cpp
@ -62,6 +65,5 @@ win32 {
} }
} }
HEADERS += \
designersettingmanager.h

2
designer/designersettingmanager.cpp
View File

@ -1,4 +1,5 @@
#include "designersettingmanager.h" #include "designersettingmanager.h"
#include <QMessageBox>
DesignerSettingManager::DesignerSettingManager(QObject *parent) : QObject(parent) DesignerSettingManager::DesignerSettingManager(QObject *parent) : QObject(parent)
{ {
@ -33,6 +34,7 @@ QLocale::Language DesignerSettingManager::getCurrentDefaultLanguage()
void DesignerSettingManager::currentDefaulLanguageChanged(QLocale::Language language) void DesignerSettingManager::currentDefaulLanguageChanged(QLocale::Language language)
{ {
QMessageBox::information(0, tr("Warning") , tr("The language will change after the application is restarted"));
m_setting->beginGroup("ReportDesigner"); m_setting->beginGroup("ReportDesigner");
m_setting->setValue("DesignerLanguage", (int)language); m_setting->setValue("DesignerLanguage", (int)language);
m_setting->endGroup(); m_setting->endGroup();

2
designer/designersettingmanager.h
View File

@ -13,8 +13,6 @@ public:
explicit DesignerSettingManager(QObject *parent = 0); explicit DesignerSettingManager(QObject *parent = 0);
~DesignerSettingManager(); ~DesignerSettingManager();
void setApplicationInstance(QApplication* application); void setApplicationInstance(QApplication* application);
signals:
public slots: public slots:
void getAviableLanguages(QList<QLocale::Language>* languages); void getAviableLanguages(QList<QLocale::Language>* languages);
QLocale::Language getCurrentDefaultLanguage(); QLocale::Language getCurrentDefaultLanguage();

2
designer/main.cpp
View File

@ -9,8 +9,6 @@ int main(int argc, char *argv[])
QApplication a(argc, argv); QApplication a(argc, argv);
DesignerSettingManager manager; DesignerSettingManager manager;
QTranslator limeReportTranslator; QTranslator limeReportTranslator;
QTranslator qtTranslator; QTranslator qtTranslator;
QString translationPath = QApplication::applicationDirPath(); QString translationPath = QApplication::applicationDirPath();

2
limereport/lrreportdesignwidget.cpp
View File

@ -467,7 +467,7 @@ bool ReportDesignWidget::loadFromFile(const QString &fileName)
// m_scriptEditor->restoreState(editorState); // m_scriptEditor->restoreState(editorState);
// emit loaded(); // emit loaded();
// m_dialogChanged = false; // m_dialogChanged = false;
// return true; return true;
} else { } else {
QMessageBox::critical(this,tr("Error"),tr("Wrong file format")); QMessageBox::critical(this,tr("Error"),tr("Wrong file format"));
return false; return false;

1
limereport/lrreportengine.cpp
View File

@ -981,7 +981,6 @@ QLocale::Language ReportEnginePrivate::currentDesignerLanguage()
void ReportEnginePrivate::setCurrentDesignerLanguage(QLocale::Language language) void ReportEnginePrivate::setCurrentDesignerLanguage(QLocale::Language language)
{ {
m_currentDesignerLanguage = language; m_currentDesignerLanguage = language;
QMessageBox::information(m_designerWindow, tr("Warning") ,tr("The language will change after the application is restarted"));
emit currentDefaulLanguageChanged(language); emit currentDefaulLanguageChanged(language);
} }

2
limereport/objectinspector/lrobjectitemmodel.cpp
View File

@ -150,7 +150,7 @@ void QObjectPropertyModel::translatePropertyName()
tr("watermark"); tr("watermark");
tr("keepTopSpace"); tr("keepTopSpace");
tr("printable"); tr("printable");
tr("AllLines"); tr("variable");
} }
void QObjectPropertyModel::clearObjectsList() void QObjectPropertyModel::clearObjectsList()

1
limereport/objectinspector/propertyItems/lrflagspropitem.cpp
View File

@ -122,6 +122,7 @@ void FlagsPropItem::translateFlagsItem()
tr("BottomLine"); tr("BottomLine");
tr("LeftLine"); tr("LeftLine");
tr("RightLine"); tr("RightLine");
tr("AllLines");
} }
FlagPropItem::FlagPropItem(QObject* object, ObjectsList* objects, const QString &propName, const QString &displayName, const QVariant &value, ObjectPropItem* parent, bool readonly) FlagPropItem::FlagPropItem(QObject* object, ObjectsList* objects, const QString &propName, const QString &displayName, const QVariant &value, ObjectPropItem* parent, bool readonly)