diff --git a/designer/designer.pro b/designer/designer.pro index d5abd1b..d3b9e26 100644 --- a/designer/designer.pro +++ b/designer/designer.pro @@ -8,6 +8,9 @@ contains(CONFIG,release) { } TEMPLATE = app +HEADERS += \ + designersettingmanager.h + SOURCES += main.cpp \ designersettingmanager.cpp @@ -62,6 +65,5 @@ win32 { } } -HEADERS += \ - designersettingmanager.h + diff --git a/designer/designersettingmanager.cpp b/designer/designersettingmanager.cpp index 6a353ab..bdbd680 100644 --- a/designer/designersettingmanager.cpp +++ b/designer/designersettingmanager.cpp @@ -1,4 +1,5 @@ #include "designersettingmanager.h" +#include DesignerSettingManager::DesignerSettingManager(QObject *parent) : QObject(parent) { @@ -33,6 +34,7 @@ QLocale::Language DesignerSettingManager::getCurrentDefaultLanguage() 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->setValue("DesignerLanguage", (int)language); m_setting->endGroup(); diff --git a/designer/designersettingmanager.h b/designer/designersettingmanager.h index 2f07d79..2443718 100644 --- a/designer/designersettingmanager.h +++ b/designer/designersettingmanager.h @@ -13,8 +13,6 @@ public: explicit DesignerSettingManager(QObject *parent = 0); ~DesignerSettingManager(); void setApplicationInstance(QApplication* application); -signals: - public slots: void getAviableLanguages(QList* languages); QLocale::Language getCurrentDefaultLanguage(); diff --git a/designer/main.cpp b/designer/main.cpp index 87c0832..d36ee1d 100644 --- a/designer/main.cpp +++ b/designer/main.cpp @@ -9,8 +9,6 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); DesignerSettingManager manager; - - QTranslator limeReportTranslator; QTranslator qtTranslator; QString translationPath = QApplication::applicationDirPath(); diff --git a/limereport/lrreportdesignwidget.cpp b/limereport/lrreportdesignwidget.cpp index 96cd9eb..b20d17e 100644 --- a/limereport/lrreportdesignwidget.cpp +++ b/limereport/lrreportdesignwidget.cpp @@ -467,7 +467,7 @@ bool ReportDesignWidget::loadFromFile(const QString &fileName) // m_scriptEditor->restoreState(editorState); // emit loaded(); // m_dialogChanged = false; -// return true; + return true; } else { QMessageBox::critical(this,tr("Error"),tr("Wrong file format")); return false; diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp index 8c6c3f9..95275c2 100644 --- a/limereport/lrreportengine.cpp +++ b/limereport/lrreportengine.cpp @@ -981,7 +981,6 @@ QLocale::Language ReportEnginePrivate::currentDesignerLanguage() void ReportEnginePrivate::setCurrentDesignerLanguage(QLocale::Language language) { m_currentDesignerLanguage = language; - QMessageBox::information(m_designerWindow, tr("Warning") ,tr("The language will change after the application is restarted")); emit currentDefaulLanguageChanged(language); } diff --git a/limereport/objectinspector/lrobjectitemmodel.cpp b/limereport/objectinspector/lrobjectitemmodel.cpp index 9c1450d..b5c8712 100644 --- a/limereport/objectinspector/lrobjectitemmodel.cpp +++ b/limereport/objectinspector/lrobjectitemmodel.cpp @@ -150,7 +150,7 @@ void QObjectPropertyModel::translatePropertyName() tr("watermark"); tr("keepTopSpace"); tr("printable"); - tr("AllLines"); + tr("variable"); } void QObjectPropertyModel::clearObjectsList() diff --git a/limereport/objectinspector/propertyItems/lrflagspropitem.cpp b/limereport/objectinspector/propertyItems/lrflagspropitem.cpp index c10eceb..de4af7c 100644 --- a/limereport/objectinspector/propertyItems/lrflagspropitem.cpp +++ b/limereport/objectinspector/propertyItems/lrflagspropitem.cpp @@ -122,6 +122,7 @@ void FlagsPropItem::translateFlagsItem() tr("BottomLine"); tr("LeftLine"); tr("RightLine"); + tr("AllLines"); } FlagPropItem::FlagPropItem(QObject* object, ObjectsList* objects, const QString &propName, const QString &displayName, const QVariant &value, ObjectPropItem* parent, bool readonly)