From 0550654b04edca8a25b3226497778aa2255216b0 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Tue, 22 Mar 2016 15:55:02 +0300 Subject: [PATCH] Some limereport's project structure changes --- .gitignore | 1 + common.pri | 29 ++ demo_r1/demo_r1.pro | 18 +- demo_r1/mainicon.rc | 1 + limereport.pro | 2 +- limereport/limereport.pri | 203 ++++++++ limereport/limereport.pro | 271 +--------- limereport/lrdatadesignintf.h | 1 + translations/limereport_es_ES.qm | Bin 0 -> 3352 bytes translations/limereport_es_ES.ts | 535 +++----------------- translations/limereport_ru.qm | Bin 87292 -> 28632 bytes translations/limereport_ru.ts | 841 ++++++++----------------------- 12 files changed, 558 insertions(+), 1344 deletions(-) create mode 100644 common.pri create mode 100644 demo_r1/mainicon.rc create mode 100644 limereport/limereport.pri create mode 100644 translations/limereport_es_ES.qm diff --git a/.gitignore b/.gitignore index 04b7a50..a3667d6 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ Makefile* #QtCtreator Qml *.qmlproject.user *.qmlproject.user.* +/build/ diff --git a/common.pri b/common.pri new file mode 100644 index 0000000..a57246b --- /dev/null +++ b/common.pri @@ -0,0 +1,29 @@ +CONFIG += zint +ZINT_PATH = $$PWD/3rdparty/zint-2.4.4 + +LIMEREPORT_VERSION_MAJOR = 1 +LIMEREPORT_VERSION_MINOR = 3 +LIMEREPORT_VERSION_RELEASE = 10 + +LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' +DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" +DEFINES += LIMEREPORT_VERSION=$${LIMEREPORT_VERSION} + +QT += script xml sql +REPORT_PATH = $$PWD/limereport + +greaterThan(QT_MAJOR_VERSION, 4) { + DEFINES+=HAVE_QT5 + QT+= printsupport widgets + contains(QT,uitools){ + message(uitools) + DEFINES += HAVE_UI_LOADER + } +} + +lessThan(QT_MAJOR_VERSION, 5){ + CONFIG(uitools){ + message(uitools) + DEFINES += HAVE_UI_LOADER + } +} diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro index 779fb55..35411aa 100644 --- a/demo_r1/demo_r1.pro +++ b/demo_r1/demo_r1.pro @@ -20,7 +20,6 @@ DEPENDPATH += $$PWD/../include RESOURCES += \ r1.qrc - EXTRA_DIR += $$PWD/demo_reports/* CONFIG(release, debug|release){ @@ -33,7 +32,8 @@ CONFIG(release, debug|release){ unix{ UNIX_DIR = $$PWD/../build/unix - DEST_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/demo_reports + DEST_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/demo + REPORTS_DIR = $${DEST_DIR}/demo_reports MOC_DIR = $${OUT_PWD}/moc UI_DIR = $${OUT_PWD}//ui UI_HEADERS_DIR = $${OUT_PWD}//ui @@ -43,7 +43,7 @@ unix{ LIBS += -L$$PWD/../build/unix/$${BUILD_TYPE}/lib -llimereport DESTDIR = $$DEST_DIR - QMAKE_POST_LINK += mkdir -p $$quote($$DESTDIR) | $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$DESTDIR) $$escape_expand(\n\t) + QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t) QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib @@ -54,9 +54,11 @@ unix{ win32 { WIN32_DIR = $$PWD/../build/win32 EXTRA_DIR ~= s,/,\\,g - - DEST_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/demo_reports/ + DEST_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/demo DEST_DIR ~= s,/,\\,g + REPORTS_DIR = $${DEST_DIR}/demo_reports + REPORTS_DIR ~= s,/,\\,g + MOC_DIR = $${OUT_PWD}/moc UI_DIR = $${OUT_PWD}/ui UI_HEADERS_DIR = $${OUT_PWD}/ui @@ -67,8 +69,10 @@ win32 { DESTDIR = $$DEST_DIR RC_FILE += mainicon.rc - QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$DESTDIR) $$escape_expand(\\n\\t) + QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\\n\\t) LIBS += -L$$PWD/../build/win32/$${BUILD_TYPE}/lib -llimereport } -INSTALLS = target +unix{ + INSTALLS = target +} diff --git a/demo_r1/mainicon.rc b/demo_r1/mainicon.rc new file mode 100644 index 0000000..83c0128 --- /dev/null +++ b/demo_r1/mainicon.rc @@ -0,0 +1 @@ +DI_ICON1 ICON "main.ico" diff --git a/limereport.pro b/limereport.pro index 319e7e8..9ec2517 100644 --- a/limereport.pro +++ b/limereport.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -CONFIG += zint +include(common.pri) contains(CONFIG, zint){ SUBDIRS += 3rdparty } diff --git a/limereport/limereport.pri b/limereport/limereport.pri new file mode 100644 index 0000000..e47b1c9 --- /dev/null +++ b/limereport/limereport.pri @@ -0,0 +1,203 @@ +include(../common.pri) + +DEFINES += INSPECT_BASEDESIGN + +INCLUDEPATH += \ + $$REPORT_PATH/ \ + $$REPORT_PATH/items \ + $$REPORT_PATH/bands \ + $$REPORT_PATH/base \ + $$REPORT_PATH/objectinspector \ + $$REPORT_PATH/databrowser + +SOURCES += \ + $$REPORT_PATH/items/lrtextitem.cpp \ + $$REPORT_PATH/bands/lrpageheader.cpp \ + $$REPORT_PATH/bands/lrpagefooter.cpp \ + $$REPORT_PATH/bands/lrreportheader.cpp \ + $$REPORT_PATH/bands/lrreportfooter.cpp \ + $$REPORT_PATH/bands/lrdataband.cpp \ + $$REPORT_PATH/bands/lrgroupbands.cpp \ + $$REPORT_PATH/bands/lrsubdetailband.cpp \ + $$REPORT_PATH/objectinspector/lrobjectinspectorwidget.cpp \ + $$REPORT_PATH/objectinspector/lrobjectitemmodel.cpp \ + $$REPORT_PATH/objectinspector/lrobjectpropitem.cpp \ + $$REPORT_PATH/objectinspector/lrpropertydelegate.cpp \ + $$REPORT_PATH/objectinspector/propertyItems/lrstringpropitem.cpp \ + $$REPORT_PATH/objectinspector/propertyItems/lrrectproptem.cpp \ + $$REPORT_PATH/objectinspector/propertyItems/lrintpropitem.cpp \ + $$REPORT_PATH/objectinspector/propertyItems/lrenumpropitem.cpp \ + $$REPORT_PATH/objectinspector/propertyItems/lrboolpropitem.cpp \ + $$REPORT_PATH/objectinspector/propertyItems/lrflagspropitem.cpp \ + $$REPORT_PATH/objectinspector/editors/lrtextitempropertyeditor.cpp \ + $$REPORT_PATH/objectinspector/editors/lrcomboboxeditor.cpp \ + $$REPORT_PATH/objectinspector/editors/lrcheckboxeditor.cpp \ + $$REPORT_PATH/objectinspector/editors/lrbuttonlineeditor.cpp \ + $$REPORT_PATH/objectinspector/propertyItems/lrfontpropitem.cpp \ + $$REPORT_PATH/objectinspector/editors/lrfonteditor.cpp \ + $$REPORT_PATH/objectinspector/editors/lrimageeditor.cpp \ + $$REPORT_PATH/objectinspector/propertyItems/lrimagepropitem.cpp \ + $$REPORT_PATH/objectinspector/lrbasedesignobjectmodel.cpp \ + $$REPORT_PATH/objectinspector/propertyItems/lrqrealpropitem.cpp \ + $$REPORT_PATH/objectinspector/editors/lrcoloreditor.cpp \ + $$REPORT_PATH/objectinspector/propertyItems/lrcolorpropitem.cpp \ + $$REPORT_PATH/objectinspector/propertyItems/lrdatasourcepropitem.cpp \ + $$REPORT_PATH/objectinspector/propertyItems/lrgroupfieldpropitem.cpp \ + $$REPORT_PATH/objectinspector/propertyItems/lrcontentpropitem.cpp \ + $$REPORT_PATH/objectsbrowser/lrobjectbrowser.cpp \ + $$REPORT_PATH/databrowser/lrdatabrowser.cpp \ + $$REPORT_PATH/databrowser/lrsqleditdialog.cpp \ + $$REPORT_PATH/databrowser/lrconnectiondialog.cpp \ + $$REPORT_PATH/databrowser/lrvariabledialog.cpp \ + $$REPORT_PATH/databrowser/lrdatabrowsertree.cpp \ + $$REPORT_PATH/serializators/lrxmlqrectserializator.cpp \ + $$REPORT_PATH/serializators/lrxmlbasetypesserializators.cpp \ + $$REPORT_PATH/serializators/lrxmlreader.cpp \ + $$REPORT_PATH/serializators/lrxmlwriter.cpp \ + $$REPORT_PATH/items/lrsubitemparentpropitem.cpp \ + $$REPORT_PATH/items/lralignpropitem.cpp \ + $$REPORT_PATH/items/lrhorizontallayout.cpp \ + $$REPORT_PATH/items/editors/lritemeditorwidget.cpp \ + $$REPORT_PATH/items/editors/lrfonteditorwidget.cpp \ + $$REPORT_PATH/items/editors/lrtextalignmenteditorwidget.cpp \ + $$REPORT_PATH/items/editors/lritemsaligneditorwidget.cpp \ + $$REPORT_PATH/items/editors/lritemsborderseditorwidget.cpp \ + $$REPORT_PATH/items/lrsimpletagparser.cpp \ + $$REPORT_PATH/items/lrimageitem.cpp \ + $$REPORT_PATH/items/lrtextitemeditor.cpp \ + $$REPORT_PATH/items/lrshapeitem.cpp \ + $$REPORT_PATH/lrbanddesignintf.cpp \ + $$REPORT_PATH/lrpageitemdesignintf.cpp \ + $$REPORT_PATH/lrpagedesignintf.cpp \ + $$REPORT_PATH/lrbandsmanager.cpp \ + $$REPORT_PATH/lrglobal.cpp \ + $$REPORT_PATH/lritemdesignintf.cpp \ + $$REPORT_PATH/lrdatadesignintf.cpp \ + $$REPORT_PATH/lrreportdesignwidget.cpp \ + $$REPORT_PATH/lrbasedesignintf.cpp \ + $$REPORT_PATH/lrreportengine.cpp \ + $$REPORT_PATH/lrdatasourcemanager.cpp \ + $$REPORT_PATH/lrreportdesignwindow.cpp \ + $$REPORT_PATH/lrreportrender.cpp \ + $$REPORT_PATH/lrscriptenginemanager.cpp \ + $$REPORT_PATH/lrpreviewreportwindow.cpp \ + $$REPORT_PATH/lrvariablesholder.cpp \ + $$REPORT_PATH/lrgroupfunctions.cpp \ + $$REPORT_PATH/lrsimplecrypt.cpp \ + $$REPORT_PATH/lraboutdialog.cpp \ + $$REPORT_PATH/lrsettingdialog.cpp + +contains(CONFIG, zint){ + SOURCES += $$REPORT_PATH/items/lrbarcodeitem.cpp +} + +HEADERS += \ + $$REPORT_PATH/base/lrsingleton.h \ + $$REPORT_PATH/bands/lrpageheader.h \ + $$REPORT_PATH/bands/lrpagefooter.h \ + $$REPORT_PATH/bands/lrreportheader.h \ + $$REPORT_PATH/bands/lrreportfooter.h \ + $$REPORT_PATH/bands/lrdataband.h \ + $$REPORT_PATH/objectinspector/lrobjectinspectorwidget.h \ + $$REPORT_PATH/objectinspector/lrobjectitemmodel.h \ + $$REPORT_PATH/objectinspector/lrobjectpropitem.h \ + $$REPORT_PATH/objectinspector/lrpropertydelegate.h \ + $$REPORT_PATH/objectinspector/propertyItems/lrstringpropitem.h \ + $$REPORT_PATH/objectinspector/propertyItems/lrrectproptem.h \ + $$REPORT_PATH/databrowser/lrdatabrowser.h \ + $$REPORT_PATH/databrowser/lrsqleditdialog.h \ + $$REPORT_PATH/databrowser/lrconnectiondialog.h \ + $$REPORT_PATH/databrowser/lrvariabledialog.h \ + $$REPORT_PATH/databrowser/lrdatabrowsertree.h \ + $$REPORT_PATH/objectinspector/propertyItems/lrdatasourcepropitem.h \ + $$REPORT_PATH/lrbanddesignintf.h \ + $$REPORT_PATH/lrpageitemdesignintf.h \ + $$REPORT_PATH/lrbandsmanager.h \ + $$REPORT_PATH/lrglobal.h \ + $$REPORT_PATH/base/lrsimpleabstractfactory.h \ + $$REPORT_PATH/base/lrattribsabstractfactory.h \ + $$REPORT_PATH/serializators/lrserializatorintf.h \ + $$REPORT_PATH/serializators/lrstorageintf.h \ + $$REPORT_PATH/serializators/lrxmlqrectserializator.h \ + $$REPORT_PATH/serializators/lrxmlserializatorsfactory.h \ + $$REPORT_PATH/serializators/lrxmlbasetypesserializators.h \ + $$REPORT_PATH/serializators/lrxmlreader.h \ + $$REPORT_PATH/serializators/lrxmlwriter.h \ + $$REPORT_PATH/lrbasedesignintf.h \ + $$REPORT_PATH/lritemdesignintf.h \ + $$REPORT_PATH/lrdesignelementsfactory.h \ + $$REPORT_PATH/objectinspector/propertyItems/lrintpropitem.h \ + $$REPORT_PATH/objectinspector/propertyItems/lrenumpropitem.h \ + $$REPORT_PATH/objectinspector/propertyItems/lrboolpropitem.h \ + $$REPORT_PATH/objectinspector/propertyItems/lrflagspropitem.h \ + $$REPORT_PATH/objectinspector/editors/lrtextitempropertyeditor.h \ + $$REPORT_PATH/objectinspector/editors/lrcomboboxeditor.h \ + $$REPORT_PATH/objectinspector/editors/lrcheckboxeditor.h \ + $$REPORT_PATH/objectinspector/editors/lrbuttonlineeditor.h \ + $$REPORT_PATH/objectinspector/propertyItems/lrgroupfieldpropitem.h \ + $$REPORT_PATH/objectinspector/propertyItems/lrcontentpropitem.h \ + $$REPORT_PATH/objectsbrowser/lrobjectbrowser.h \ + $$REPORT_PATH/items/lrtextitem.h \ + $$REPORT_PATH/items/lrsubitemparentpropitem.h \ + $$REPORT_PATH/items/lralignpropitem.h \ + $$REPORT_PATH/items/lrhorizontallayout.h \ + $$REPORT_PATH/items/editors/lritemeditorwidget.h \ + $$REPORT_PATH/items/editors/lrfonteditorwidget.h \ + $$REPORT_PATH/items/editors/lrtextalignmenteditorwidget.h \ + $$REPORT_PATH/items/editors/lritemsaligneditorwidget.h \ + $$REPORT_PATH/items/editors/lritemsborderseditorwidget.h \ + $$REPORT_PATH/lrdatadesignintf.h \ + $$REPORT_PATH/lrcollection.h \ + $$REPORT_PATH/lrpagedesignintf.h \ + $$REPORT_PATH/lrreportdesignwidget.h \ + $$REPORT_PATH/lrreportengine_p.h \ + $$REPORT_PATH/lrdatasourcemanager.h \ + $$REPORT_PATH/lrreportdesignwindow.h \ + $$REPORT_PATH/items/lrsimpletagparser.h \ + $$REPORT_PATH/bands/lrsubdetailband.h \ + $$REPORT_PATH/lrreportrender.h \ + $$REPORT_PATH/lrpreviewreportwindow.h \ + $$REPORT_PATH/objectinspector/propertyItems/lrfontpropitem.h \ + $$REPORT_PATH/objectinspector/editors/lrfonteditor.h \ + $$REPORT_PATH/items/lrimageitem.h \ + $$REPORT_PATH/objectinspector/editors/lrimageeditor.h \ + $$REPORT_PATH/objectinspector/propertyItems/lrimagepropitem.h \ + $$REPORT_PATH/items/lrtextitemeditor.h \ + $$REPORT_PATH/objectinspector/lrbasedesignobjectmodel.h \ + $$REPORT_PATH/lrscriptenginemanager.h \ + $$REPORT_PATH/objectinspector/propertyItems/lrqrealpropitem.h \ + $$REPORT_PATH/items/lrshapeitem.h \ + $$REPORT_PATH/objectinspector/editors/lrcoloreditor.h \ + $$REPORT_PATH/objectinspector/propertyItems/lrcolorpropitem.h \ + $$REPORT_PATH/bands/lrgroupbands.h \ + $$REPORT_PATH/lrvariablesholder.h \ + $$REPORT_PATH/lrgroupfunctions.h \ + $$REPORT_PATH/lrreportengine.h \ + $$REPORT_PATH/lrdatasourcemanagerintf.h \ + $$REPORT_PATH/lrscriptenginemanagerintf.h \ + $$REPORT_PATH/lrsimplecrypt.h \ + $$REPORT_PATH/lraboutdialog.h \ + $$REPORT_PATH/lrcallbackdatasourceintf.h \ + $$REPORT_PATH/lrsettingdialog.h + +contains(CONFIG,zint){ + HEADERS += $$REPORT_PATH/items/lrbarcodeitem.h +} + +FORMS += \ + $$REPORT_PATH/databrowser/lrsqleditdialog.ui \ + $$REPORT_PATH/databrowser/lrconnectiondialog.ui \ + $$REPORT_PATH/databrowser/lrdatabrowser.ui \ + $$REPORT_PATH/databrowser/lrvariabledialog.ui \ + $$REPORT_PATH/objectinspector/editors/ltextitempropertyeditor.ui \ + $$REPORT_PATH/lrpreviewreportwindow.ui \ + $$REPORT_PATH/items/lrtextitemeditor.ui \ + $$REPORT_PATH/lraboutdialog.ui \ + $$REPORT_PATH/lrsettingdialog.ui + +RESOURCES += \ + $$REPORT_PATH/objectinspector/lobjectinspector.qrc \ + $$REPORT_PATH/databrowser/lrdatabrowser.qrc \ + $$REPORT_PATH/report.qrc \ + $$REPORT_PATH/items/items.qrc + diff --git a/limereport/limereport.pro b/limereport/limereport.pro index 6a2af27..4f6dafe 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -1,21 +1,5 @@ TARGET = limereport TEMPLATE = lib -QT += script xml sql -greaterThan(QT_MAJOR_VERSION, 4) { - DEFINES+=HAVE_QT5 - QT+= printsupport widgets - contains(QT,uitools){ - message(uitools) - DEFINES += HAVE_UI_LOADER - } -} - -lessThan(QT_MAJOR_VERSION, 5){ - CONFIG(uitools){ - message(uitools) - DEFINES += HAVE_UI_LOADER - } -} CONFIG(release, debug|release){ message(Release) @@ -24,24 +8,15 @@ CONFIG(release, debug|release){ message(Debug) BUILD_TYPE = debug } + CONFIG += lib CONFIG += dll CONFIG += create_prl CONFIG += link_prl CONFIG -= app_bundle -LIMEREPORT_VERSION_MAJOR = 1 -LIMEREPORT_VERSION_MINOR = 3 -LIMEREPORT_VERSION_RELEASE = 10 -LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' - -DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" -DEFINES += LIMEREPORT_VERSION=$${LIMEREPORT_VERSION} - -DEFINES += INSPECT_BASEDESIGN DEFINES += LIMEREPORT_EXPORTS -REPORT_PATH = $$PWD EXTRA_FILES += \ $$PWD/lrglobal.cpp \ $$PWD/lrglobal.h \ @@ -66,7 +41,6 @@ unix { for(FILE,EXTRA_FILES){ QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) | $$QMAKE_COPY $$quote($$FILE) $$quote($$DESTDIR/include/) $$escape_expand(\\n\\t) } - } win32 { @@ -82,239 +56,42 @@ win32 { OBJECTS_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/obj RCC_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/rcc DESTDIR = $$PWD/../build/win32/$${BUILD_TYPE}/lib - } -DEPENDPATH += report report/bands report/base report/databrowser report/items report/objectinspector -INCLUDEPATH += report report/bands report/base report/databrowser report/items report/objectinspector +include(limereport.pri) contains(CONFIG,zint){ - LIBS += -L$${DEST_DIR} -lQtZint + message(zint) + INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4 + DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4 + LIBS += -L$${DESTDIR} -lQtZint } - -INCLUDEPATH += \ - $$REPORT_PATH/ \ - $$REPORT_PATH/items \ - $$REPORT_PATH/bands \ - $$REPORT_PATH/base \ - $$REPORT_PATH/objectinspector \ - $$REPORT_PATH/databrowser - -SOURCES += \ - $$REPORT_PATH/items/lrtextitem.cpp \ - $$REPORT_PATH/bands/lrpageheader.cpp \ - $$REPORT_PATH/bands/lrpagefooter.cpp \ - $$REPORT_PATH/bands/lrreportheader.cpp \ - $$REPORT_PATH/bands/lrreportfooter.cpp \ - $$REPORT_PATH/bands/lrdataband.cpp \ - $$REPORT_PATH/bands/lrgroupbands.cpp \ - $$REPORT_PATH/bands/lrsubdetailband.cpp \ - $$REPORT_PATH/objectinspector/lrobjectinspectorwidget.cpp \ - $$REPORT_PATH/objectinspector/lrobjectitemmodel.cpp \ - $$REPORT_PATH/objectinspector/lrobjectpropitem.cpp \ - $$REPORT_PATH/objectinspector/lrpropertydelegate.cpp \ - $$REPORT_PATH/objectinspector/propertyItems/lrstringpropitem.cpp \ - $$REPORT_PATH/objectinspector/propertyItems/lrrectproptem.cpp \ - $$REPORT_PATH/objectinspector/propertyItems/lrintpropitem.cpp \ - $$REPORT_PATH/objectinspector/propertyItems/lrenumpropitem.cpp \ - $$REPORT_PATH/objectinspector/propertyItems/lrboolpropitem.cpp \ - $$REPORT_PATH/objectinspector/propertyItems/lrflagspropitem.cpp \ - $$REPORT_PATH/objectinspector/editors/lrtextitempropertyeditor.cpp \ - $$REPORT_PATH/objectinspector/editors/lrcomboboxeditor.cpp \ - $$REPORT_PATH/objectinspector/editors/lrcheckboxeditor.cpp \ - $$REPORT_PATH/objectinspector/editors/lrbuttonlineeditor.cpp \ - $$REPORT_PATH/objectinspector/propertyItems/lrfontpropitem.cpp \ - $$REPORT_PATH/objectinspector/editors/lrfonteditor.cpp \ - $$REPORT_PATH/objectinspector/editors/lrimageeditor.cpp \ - $$REPORT_PATH/objectinspector/propertyItems/lrimagepropitem.cpp \ - $$REPORT_PATH/objectinspector/lrbasedesignobjectmodel.cpp \ - $$REPORT_PATH/objectinspector/propertyItems/lrqrealpropitem.cpp \ - $$REPORT_PATH/objectinspector/editors/lrcoloreditor.cpp \ - $$REPORT_PATH/objectinspector/propertyItems/lrcolorpropitem.cpp \ - $$REPORT_PATH/objectinspector/propertyItems/lrdatasourcepropitem.cpp \ - $$REPORT_PATH/objectinspector/propertyItems/lrgroupfieldpropitem.cpp \ - $$REPORT_PATH/objectinspector/propertyItems/lrcontentpropitem.cpp \ - $$REPORT_PATH/objectsbrowser/lrobjectbrowser.cpp \ - $$REPORT_PATH/databrowser/lrdatabrowser.cpp \ - $$REPORT_PATH/databrowser/lrsqleditdialog.cpp \ - $$REPORT_PATH/databrowser/lrconnectiondialog.cpp \ - $$REPORT_PATH/databrowser/lrvariabledialog.cpp \ - $$REPORT_PATH/databrowser/lrdatabrowsertree.cpp \ - $$REPORT_PATH/serializators/lrxmlqrectserializator.cpp \ - $$REPORT_PATH/serializators/lrxmlbasetypesserializators.cpp \ - $$REPORT_PATH/serializators/lrxmlreader.cpp \ - $$REPORT_PATH/serializators/lrxmlwriter.cpp \ - $$REPORT_PATH/items/lrsubitemparentpropitem.cpp \ - $$REPORT_PATH/items/lralignpropitem.cpp \ - $$REPORT_PATH/items/lrhorizontallayout.cpp \ - $$REPORT_PATH/items/editors/lritemeditorwidget.cpp \ - $$REPORT_PATH/items/editors/lrfonteditorwidget.cpp \ - $$REPORT_PATH/items/editors/lrtextalignmenteditorwidget.cpp \ - $$REPORT_PATH/items/editors/lritemsaligneditorwidget.cpp \ - $$REPORT_PATH/items/editors/lritemsborderseditorwidget.cpp \ - $$REPORT_PATH/items/lrsimpletagparser.cpp \ - $$REPORT_PATH/items/lrimageitem.cpp \ - $$REPORT_PATH/items/lrtextitemeditor.cpp \ - $$REPORT_PATH/items/lrshapeitem.cpp \ - $$REPORT_PATH/lrbanddesignintf.cpp \ - $$REPORT_PATH/lrpageitemdesignintf.cpp \ - $$REPORT_PATH/lrpagedesignintf.cpp \ - $$REPORT_PATH/lrbandsmanager.cpp \ - $$REPORT_PATH/lrglobal.cpp \ - $$REPORT_PATH/lritemdesignintf.cpp \ - $$REPORT_PATH/lrdatadesignintf.cpp \ - $$REPORT_PATH/lrreportdesignwidget.cpp \ - $$REPORT_PATH/lrbasedesignintf.cpp \ - $$REPORT_PATH/lrreportengine.cpp \ - $$REPORT_PATH/lrdatasourcemanager.cpp \ - $$REPORT_PATH/lrreportdesignwindow.cpp \ - $$REPORT_PATH/lrreportrender.cpp \ - $$REPORT_PATH/lrscriptenginemanager.cpp \ - $$REPORT_PATH/lrpreviewreportwindow.cpp \ - $$REPORT_PATH/lrvariablesholder.cpp \ - $$REPORT_PATH/lrgroupfunctions.cpp \ - $$REPORT_PATH/lrsimplecrypt.cpp \ - $$REPORT_PATH/lraboutdialog.cpp \ - $$REPORT_PATH/lrsettingdialog.cpp - -contains(CONFIG, zint){ - SOURCES += $$REPORT_PATH/items/lrbarcodeitem.cpp -} - -HEADERS += \ - $$REPORT_PATH/base/lrsingleton.h \ - $$REPORT_PATH/bands/lrpageheader.h \ - $$REPORT_PATH/bands/lrpagefooter.h \ - $$REPORT_PATH/bands/lrreportheader.h \ - $$REPORT_PATH/bands/lrreportfooter.h \ - $$REPORT_PATH/bands/lrdataband.h \ - $$REPORT_PATH/objectinspector/lrobjectinspectorwidget.h \ - $$REPORT_PATH/objectinspector/lrobjectitemmodel.h \ - $$REPORT_PATH/objectinspector/lrobjectpropitem.h \ - $$REPORT_PATH/objectinspector/lrpropertydelegate.h \ - $$REPORT_PATH/objectinspector/propertyItems/lrstringpropitem.h \ - $$REPORT_PATH/objectinspector/propertyItems/lrrectproptem.h \ - $$REPORT_PATH/databrowser/lrdatabrowser.h \ - $$REPORT_PATH/databrowser/lrsqleditdialog.h \ - $$REPORT_PATH/databrowser/lrconnectiondialog.h \ - $$REPORT_PATH/databrowser/lrvariabledialog.h \ - $$REPORT_PATH/databrowser/lrdatabrowsertree.h \ - $$REPORT_PATH/objectinspector/propertyItems/lrdatasourcepropitem.h \ - $$REPORT_PATH/lrbanddesignintf.h \ - $$REPORT_PATH/lrpageitemdesignintf.h \ - $$REPORT_PATH/lrbandsmanager.h \ - $$REPORT_PATH/lrglobal.h \ - $$REPORT_PATH/base/lrsimpleabstractfactory.h \ - $$REPORT_PATH/base/lrattribsabstractfactory.h \ - $$REPORT_PATH/serializators/lrserializatorintf.h \ - $$REPORT_PATH/serializators/lrstorageintf.h \ - $$REPORT_PATH/serializators/lrxmlqrectserializator.h \ - $$REPORT_PATH/serializators/lrxmlserializatorsfactory.h \ - $$REPORT_PATH/serializators/lrxmlbasetypesserializators.h \ - $$REPORT_PATH/serializators/lrxmlreader.h \ - $$REPORT_PATH/serializators/lrxmlwriter.h \ - $$REPORT_PATH/lrbasedesignintf.h \ - $$REPORT_PATH/lritemdesignintf.h \ - $$REPORT_PATH/lrdesignelementsfactory.h \ - $$REPORT_PATH/objectinspector/propertyItems/lrintpropitem.h \ - $$REPORT_PATH/objectinspector/propertyItems/lrenumpropitem.h \ - $$REPORT_PATH/objectinspector/propertyItems/lrboolpropitem.h \ - $$REPORT_PATH/objectinspector/propertyItems/lrflagspropitem.h \ - $$REPORT_PATH/objectinspector/editors/lrtextitempropertyeditor.h \ - $$REPORT_PATH/objectinspector/editors/lrcomboboxeditor.h \ - $$REPORT_PATH/objectinspector/editors/lrcheckboxeditor.h \ - $$REPORT_PATH/objectinspector/editors/lrbuttonlineeditor.h \ - $$REPORT_PATH/objectinspector/propertyItems/lrgroupfieldpropitem.h \ - $$REPORT_PATH/objectinspector/propertyItems/lrcontentpropitem.h \ - $$REPORT_PATH/objectsbrowser/lrobjectbrowser.h \ - $$REPORT_PATH/items/lrtextitem.h \ - $$REPORT_PATH/items/lrsubitemparentpropitem.h \ - $$REPORT_PATH/items/lralignpropitem.h \ - $$REPORT_PATH/items/lrhorizontallayout.h \ - $$REPORT_PATH/items/editors/lritemeditorwidget.h \ - $$REPORT_PATH/items/editors/lrfonteditorwidget.h \ - $$REPORT_PATH/items/editors/lrtextalignmenteditorwidget.h \ - $$REPORT_PATH/items/editors/lritemsaligneditorwidget.h \ - $$REPORT_PATH/items/editors/lritemsborderseditorwidget.h \ - $$REPORT_PATH/lrdatadesignintf.h \ - $$REPORT_PATH/lrcollection.h \ - $$REPORT_PATH/lrpagedesignintf.h \ - $$REPORT_PATH/lrreportdesignwidget.h \ - $$REPORT_PATH/lrreportengine_p.h \ - $$REPORT_PATH/lrdatasourcemanager.h \ - $$REPORT_PATH/lrreportdesignwindow.h \ - $$REPORT_PATH/items/lrsimpletagparser.h \ - $$REPORT_PATH/bands/lrsubdetailband.h \ - $$REPORT_PATH/lrreportrender.h \ - $$REPORT_PATH/lrpreviewreportwindow.h \ - $$REPORT_PATH/objectinspector/propertyItems/lrfontpropitem.h \ - $$REPORT_PATH/objectinspector/editors/lrfonteditor.h \ - $$REPORT_PATH/items/lrimageitem.h \ - $$REPORT_PATH/objectinspector/editors/lrimageeditor.h \ - $$REPORT_PATH/objectinspector/propertyItems/lrimagepropitem.h \ - $$REPORT_PATH/items/lrtextitemeditor.h \ - $$REPORT_PATH/objectinspector/lrbasedesignobjectmodel.h \ - $$REPORT_PATH/lrscriptenginemanager.h \ - $$REPORT_PATH/objectinspector/propertyItems/lrqrealpropitem.h \ - $$REPORT_PATH/items/lrshapeitem.h \ - $$REPORT_PATH/objectinspector/editors/lrcoloreditor.h \ - $$REPORT_PATH/objectinspector/propertyItems/lrcolorpropitem.h \ - $$REPORT_PATH/bands/lrgroupbands.h \ - $$REPORT_PATH/lrvariablesholder.h \ - $$REPORT_PATH/lrgroupfunctions.h \ - $$REPORT_PATH/lrreportengine.h \ - $$REPORT_PATH/lrdatasourcemanagerintf.h \ - $$REPORT_PATH/lrscriptenginemanagerintf.h \ - $$REPORT_PATH/lrsimplecrypt.h \ - $$REPORT_PATH/lraboutdialog.h \ - $$REPORT_PATH/lrcallbackdatasourceintf.h \ - $$REPORT_PATH/lrsettingdialog.h - -contains(CONFIG,zint){ - HEADERS += $$REPORT_PATH/items/lrbarcodeitem.h -} - -FORMS += \ - $$REPORT_PATH/databrowser/lrsqleditdialog.ui \ - $$REPORT_PATH/databrowser/lrconnectiondialog.ui \ - $$REPORT_PATH/databrowser/lrdatabrowser.ui \ - $$REPORT_PATH/databrowser/lrvariabledialog.ui \ - $$REPORT_PATH/objectinspector/editors/ltextitempropertyeditor.ui \ - $$REPORT_PATH/lrpreviewreportwindow.ui \ - $$REPORT_PATH/items/lrtextitemeditor.ui \ - $$REPORT_PATH/lraboutdialog.ui \ - $$REPORT_PATH/lrsettingdialog.ui - -RESOURCES += \ - $$REPORT_PATH/objectinspector/lobjectinspector.qrc \ - $$REPORT_PATH/databrowser/lrdatabrowser.qrc \ - $$REPORT_PATH/report.qrc \ - $$REPORT_PATH/items/items.qrc - - - - ####### ####Automatically build required translation files (*.qm) + + +LANGUAGES = ru es_ES + +defineReplace(prependAll) { + for(a,$$1):result += $$2$${a}$$3 + return($$result) +} + TRANSLATIONS_PATH = $$PWD/../translations -TRANSLATIONS += $$TRANSLATIONS_PATH/limereport_ru.ts \ - $$TRANSLATIONS_PATH/limereport_es_ES.ts +TRANSLATIONS = $$prependAll(LANGUAGES, $$TRANSLATIONS_PATH/limereport_,.ts) -OTHER_FILES += $$TRANSLATIONS +qtPrepareTool(LUPDATE, lupdate) +ts.commands = $$LUPDATE $$_PRO_FILE_ -all.depends = locale +qtPrepareTool(LRELEASE, lrelease) +qm.commands = $$LRELEASE $$_PRO_FILE_ +qm.depends = ts -TRANSLATIONS_TARGETS = $$replace(TRANSLATIONS, "\.ts", ".qm") -locale.depends = $$TRANSLATIONS_TARGETS -QMAKE_EXTRA_TARGETS += locale +QMAKE_EXTRA_TARGETS += qm ts +POST_TARGETDEPS += qm ts -"%.qm".commands = lrelease -qm $@ $< -"%.qm".depends = "%.ts" -QMAKE_EXTRA_TARGETS += "%.qm" - -PRE_TARGETDEPS += locale #### EN AUTOMATIC TRANSLATIONS -#INSTALLS += target + diff --git a/limereport/lrdatadesignintf.h b/limereport/lrdatadesignintf.h index 82a3bc1..d19ac5c 100644 --- a/limereport/lrdatadesignintf.h +++ b/limereport/lrdatadesignintf.h @@ -284,6 +284,7 @@ private: }; class MasterDetailProxyModel : public QSortFilterProxyModel{ + Q_OBJECT public: MasterDetailProxyModel(DataSourceManager* dataManager):m_maps(0),m_dataManager(dataManager){} void setMaster(QString name); diff --git a/translations/limereport_es_ES.qm b/translations/limereport_es_ES.qm new file mode 100644 index 0000000000000000000000000000000000000000..5e99f0560cbb83d88e603d705f1c8f92461265de GIT binary patch literal 3352 zcmb7GU1%It6h52mY&MgaENQGU)H;iOQ{Vif79rV0o3NHNO;fQdoy^>1$Ii}OXYS?? z(Fb1?3W87($%`N;sn7=z6ss*_kcJ9^3cmEkDk!L>=z~90{O+CX?%kx_9UpcsGdt%y z=ljmz9Qe>3+Pu1U`pf*D^C#Z=LH@zCy3H(WZeA?&VDiu-cLl2ka2 zDK+@sFZlm*YU*9Q-!+ihJo^glFLeC1u>t!(JD2~thIlIJQ)lOJ|6=-$iE~7me0-W` z;3lwY<~VRum(rh_eR%JS_%yE?%bCM?erxvC7k)$>-(}x91wPsJ?D~}- za9;1ecqs=ylji#OdE6W3#!tWDJ&MonZ{yQ+d*A#Q{*8NYDZT#;@JoF^{|)}eX8)DD zK0^G99#PNvP8jBBgak1P$RUq@rywigGWd0m2*Cp3@t{k-SDc=;L(iV`*_dbhd?6*R zd+88yD$^W=#OjvmLw1?n+$c*ka8)7RFqm1Xv@kGfmTdCjDXg0qv$kJtVUtrfAspF= z&ex*L)_B}J!Xa9LnFU#v0T3yHEXq^9?tZ|s{gB!2ip7?_NJLgXFX8qSy)v6-6&{NH z`$uYyqJ!LbS*R2ng3`Pt^e)TgEV2SF{x9}Dw1}`Z&hX>FTcG^;xJuvKv$bn+E3ej) zCrVa;+*!%E44`%#h!o-~<#IKZjgdKC6%yyRCQam1t$<8GRH3h)+RR8*lz7NOGh-Bd9;w1;={QG4q*g{BSH4{b=qh>+3lc!c*yrH;S*?e0MnWFrra*6Nz9M#7t4Nf^=q zP0%Vm2S`t8>rz9Qbdk-gj3x-HkH(ZegTy5b!cQ{3E2$7 zH!2HUR#h7aWXrDunJ6-El?TH16XNC2V6xn$*s|msSlLAu3eQQ5v>W!aF{M5-Dx?ez z)F9bsIXnoMBbaLmuKICUFQ`#FaK~7Ls+tJIysD<*dMnksz6RcCj$X7DuR%-FO#`bC zyTruTIy8qavsIHYj8VPQG6g$un9{C2%wC#;a9lM^2&y&ua=_|aCs!yj=VUF!t>x1m zUPc+~xgF4Kuu4XFpT5)Lsn#Oi{sz2NTYK%peU!!_rgcM4Qsf=_;0aS*F8`BL-l1Q$ zav9ndh2=#SD_4YS`}W~XZC6ior<0 zxW!uz;28RvCTe!dj-n+Vy2u^O7WLZJeQ7nfykx1poj5 literal 0 HcmV?d00001 diff --git a/translations/limereport_es_ES.ts b/translations/limereport_es_ES.ts index 364cea3..c951782 100644 --- a/translations/limereport_es_ES.ts +++ b/translations/limereport_es_ES.ts @@ -4,27 +4,22 @@ LRVariableDialog - Variable Variable - Name Nombre - Value Valor - Type Tipo - Attention Atención @@ -32,22 +27,14 @@ LimeReport::AVariablesHolder - - - - variable with name variable con el nombre - already exists !! ya existe !! - - - does not exists !! no existe !! @@ -55,17 +42,26 @@ LimeReport::AboutDialog - About Acerca de - - Lime Report - + Author + Autor + + + License + Licencia + + + Close + Cerrar + + + Lime Report + - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -82,12 +78,6 @@ p, li { white-space: pre-wrap; } - - Author - Autor - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -97,12 +87,6 @@ p, li { white-space: pre-wrap; } - - License - Licencia - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -220,56 +204,41 @@ p, li { white-space: pre-wrap; } - - Close - Cerrar - - - Version 1.1.1 - + LimeReport::AlignmentPropItem - Left Izquierda - Right Derecha - - Center Centro - Justify Justificado - Top Arriba - Botom Abajo - horizontal horizontal - vertical vertical @@ -277,7 +246,6 @@ p, li { white-space: pre-wrap; } LimeReport::BandDesignIntf - connected to conectado a @@ -285,89 +253,70 @@ p, li { white-space: pre-wrap; } LimeReport::ConnectionDialog - - Connection Conexión - Connection Name Nombre de conexión - - Driver - - - - Server Servidor - User Usuario - Password Contraseña - Database Base de Datos - - ... - - - - Auto connect Auto conectar - Check connection Probar conexión - Cancel Cancelar - - Ok - - - - - - Error - - - - Connection succsesfully established! Conexión establecida satisfactoriamente! - Connection Name is empty El Nombre de la conexión esta vacía - + Driver + + + + ... + + + + Ok + + + + Error + + + Connection with name - already exists @@ -375,7 +324,6 @@ p, li { white-space: pre-wrap; } LimeReport::ContentItemDesignIntf - Variable %1 not found @@ -383,7 +331,6 @@ p, li { white-space: pre-wrap; } LimeReport::DataBand - Data @@ -391,113 +338,78 @@ p, li { white-space: pre-wrap; } LimeReport::DataBrowser - - - + Attention + Atención + + Datasources - Add database connection - - - - - - - - - - - - ... - Add new datasource - View data - Change datasource - Delete datasource - Show error - Variables - Add new variable - Edit variable - Delete variable - - - - - Attention - - - - Do you really want to delete "%1" connection ? - User variables - System variables - Do you really want to delete "%1" datasource ? - Do you really want to delete variable "%1" ? - Error @@ -505,7 +417,6 @@ p, li { white-space: pre-wrap; } LimeReport::DataFooterBand - DataFooter @@ -513,7 +424,6 @@ p, li { white-space: pre-wrap; } LimeReport::DataHeaderBand - DataHeader @@ -521,36 +431,26 @@ p, li { white-space: pre-wrap; } LimeReport::DataSourceManager - Connection "%1" is not open - Variable "%1" not found! - - Datasource "%1" not found ! - connection with name "%1" already exists ! - - - - datasource with name "%1" already exists ! - invalid connection @@ -558,12 +458,10 @@ p, li { white-space: pre-wrap; } LimeReport::DataSourceModel - Datasources - Variables @@ -571,17 +469,14 @@ p, li { white-space: pre-wrap; } LimeReport::FontEditorWidget - Font bold - Font Italic - Font Underline @@ -589,27 +484,22 @@ p, li { white-space: pre-wrap; } LimeReport::FontPropItem - bold - italic - underline - size - family @@ -617,7 +507,6 @@ p, li { white-space: pre-wrap; } LimeReport::GroupBandFooter - GroupFooter @@ -625,7 +514,6 @@ p, li { white-space: pre-wrap; } LimeReport::GroupBandHeader - GroupHeader @@ -633,17 +521,14 @@ p, li { white-space: pre-wrap; } LimeReport::GroupFunction - Field "%1" not found - Variable "%1" not found - Item "%1" not found @@ -651,7 +536,6 @@ p, li { white-space: pre-wrap; } LimeReport::ImageItem - Image @@ -659,52 +543,42 @@ p, li { white-space: pre-wrap; } LimeReport::ItemsAlignmentEditorWidget - Bring to top - Send to back - Align to left - Align to right - Align to vertical center - Align to top - Align to bottom - Align to horizontal center - Set same height - Set same width @@ -712,32 +586,26 @@ p, li { white-space: pre-wrap; } LimeReport::ItemsBordersEditorWidget - Top line - Bottom line - Left line - Right line - No borders - All borders @@ -745,12 +613,10 @@ p, li { white-space: pre-wrap; } LimeReport::MasterDetailProxyModel - Field: "%1" not found in "%2" child datasource - Field: "%1" not found in "%2" master datasource @@ -758,7 +624,6 @@ p, li { white-space: pre-wrap; } LimeReport::ModelToDataSource - model is destroyed @@ -766,7 +631,6 @@ p, li { white-space: pre-wrap; } LimeReport::ObjectBrowser - Objects @@ -774,7 +638,6 @@ p, li { white-space: pre-wrap; } LimeReport::PageFooter - Page Footer @@ -782,7 +645,6 @@ p, li { white-space: pre-wrap; } LimeReport::PageHeader - Page Header @@ -790,118 +652,90 @@ p, li { white-space: pre-wrap; } LimeReport::PreviewReportWindow - Preview - View - Report - toolBar - Print - Ctrl+P - Zoom In - Zoom Out - - Prior Page - - Next Page - - Close Preview - Edit Mode - - Save to file - - Show errors - First Page - First page - - Last Page - Print To PDF - Page: - of %1 - Report file name - PDF file name @@ -909,7 +743,6 @@ p, li { white-space: pre-wrap; } LimeReport::ProxyHolder - Datasource has been invalidated @@ -917,247 +750,198 @@ p, li { white-space: pre-wrap; } LimeReport::QObjectPropertyModel - leftMargin - rightMargin - topMargin - bottomMargin - objectName - borders - geometry - itemAlign - pageOrientation - pageSize - TopLine - BottomLine - LeftLine - RightLine - reprintOnEachPage - borderLineSize - autoHeight - backgroundColor - columnCount - columnsFillDirection - datasource - keepBottomSpace - keepFooterTogether - keepSubdetailTogether - printIfEmpty - sliceLastRow - splittable - alignment - angle - autoWidth - backgroundMode - backgroundOpacity - content - font - fontColor - foregroundOpacity - itemLocation - margin - stretchToMaxHeight - trimValue - lineWidth - opacity - penStyle - shape - shapeBrush - shapeBrushColor - Property Name - Property value - Warning @@ -1165,16 +949,10 @@ p, li { white-space: pre-wrap; } LimeReport::RectMMPropItem - - - width - - - height @@ -1182,12 +960,10 @@ p, li { white-space: pre-wrap; } LimeReport::RectPropItem - width - height @@ -1195,7 +971,6 @@ p, li { white-space: pre-wrap; } LimeReport::ReportDesignWidget - Report file name @@ -1203,281 +978,233 @@ p, li { white-space: pre-wrap; } LimeReport::ReportDesignWindow - + About + Acerca de + + New Report - Edit Mode - Undo - Redo - Copy - Paste - Cut - Settings - Use grid - Use magnet - Text Item - Save Report - Save Report As - Load Report - Delete item - Zoom In - Zoom Out - Render Report - Edit layouts mode - Horizontal layout - - About - - - - Hide left panel - Hide right panel - Report Tools - Main Tools - Font - Text alignment - Items alignment - Borders - Report bands - Report Header - Report Footer - Page Header - Page Footer - Data - Data Header - Data Footer - SubDetail - SubDetailHeader - SubDetailFooter - GroupHeader - GroupFooter - File - Edit - Info - Recent Files - Object Inspector - Report structure - Data Browser - Report has been modified ! Do you want save the report ? - - Report file name - Rendering report - Abort - page rendered + + Warning + + + + File "%1" not found! + + LimeReport::ReportEnginePrivate - Error @@ -1485,7 +1212,6 @@ p, li { white-space: pre-wrap; } LimeReport::ReportFooter - Report Footer @@ -1493,7 +1219,6 @@ p, li { white-space: pre-wrap; } LimeReport::ReportHeader - Report Header @@ -1501,17 +1226,14 @@ p, li { white-space: pre-wrap; } LimeReport::ReportRender - Error - Databand "%1" not found - Wrong using function %1 @@ -1519,125 +1241,98 @@ p, li { white-space: pre-wrap; } LimeReport::SQLEditDialog - + Connection + Conexión + + + Cancel + Cancelar + + + Attention + Atención + + Datasource - - Connection - - - - Datasource Name - Subdetail - Master datasource - Subquery mode - Filter mode - SQL - - Preview - Hide Preview - Child datasource - Fields map - - ... - Data preview - - Cancel - - - - Ok - Error - Datasource Name is empty ! - SQL is empty ! - Datasource with name: "%1" already exists ! - Datasource with name %1 already exist - - - Attention - - - - Connection is not specified - Refresh @@ -1645,39 +1340,26 @@ p, li { white-space: pre-wrap; } LimeReport::ScriptEngineManager - + Value + Valor + + FieldName - - BandName - - - - - Value - - - - - - - Format - Precision - Locale @@ -1685,27 +1367,22 @@ p, li { white-space: pre-wrap; } LimeReport::SettingDialog - Designer setting - Default font - Grid - Vertical grid step - Horizontal grid step @@ -1713,7 +1390,6 @@ p, li { white-space: pre-wrap; } LimeReport::SubDetailBand - SubDetail @@ -1721,7 +1397,6 @@ p, li { white-space: pre-wrap; } LimeReport::SubDetailHeaderBand - SubDetailHeader @@ -1729,33 +1404,26 @@ p, li { white-space: pre-wrap; } LimeReport::TextAlignmentEditorWidget - Text align left - - Text align center - Text align right - Text align justify - Text align top - Text align bottom @@ -1763,57 +1431,46 @@ p, li { white-space: pre-wrap; } LimeReport::TextItemEditor - + Cancel + Cancelar + + Text Item Editor - Content - Data - Functions - Editor settings - Editor font - ... - Ok - Ctrl+Return - - Cancel - - - - Esc @@ -1821,252 +1478,194 @@ p, li { white-space: pre-wrap; } QObject - - Data - DataHeader - DataFooter - GroupHeader - GroupFooter - - Page Footer - - Page Header - - Report Footer - - Report Header - - SubDetail - SubDetailHeader - SubDetailFooter - alignment - Barcode Item - HLayout - Image Item - Shape Item - itemLocation - Text Item - - Invalid connection! %1 - Master datasource "%1" not found!!! - Master datasouce "%1" not found! - Child - and child - datasouce "%1" not found! - Attention! - Selected elements have different parent containers - Object with name %1 already exists - Function %1 not found or have wrong arguments - bool - QColor - content - - datasource - - field - enum - flags - QFont - QImage - int - - qreal - QRect - QRectF - geometry - mm - QString - File %1 not opened - Content string is empty - Content is empty diff --git a/translations/limereport_ru.qm b/translations/limereport_ru.qm index 79608695329a278f345017b5d2cc9df080352841..1f378b94cf1c8b2cd26eff51ea18537fb8344088 100644 GIT binary patch delta 4171 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 literal 87292 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 LRVariableDialog - Variable Переменная - Name Имя переменной - Value Значение - Type Тип - Attention Внимание @@ -165,22 +160,14 @@ LimeReport::AVariablesHolder - - - - variable with name переменная - already exists !! уже существует !! - - - does not exists !! не существует !! @@ -188,17 +175,30 @@ LimeReport::AboutDialog - About О программе - + Author + Автор + + + License + Лицензия + + + Close + Закрыть + + + Version 1.1.1 + Версия + + Lime Report - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -215,12 +215,6 @@ p, li { white-space: pre-wrap; } - - Author - Автор - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -230,12 +224,6 @@ p, li { white-space: pre-wrap; } - - License - Лицензия - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -352,57 +340,38 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">That's all there is to it!</span></p></body></html> - - - Close - Закрыть - - - - Version 1.1.1 - Версия - LimeReport::AlignmentPropItem - Left По левому краю - Right По правому краю - - Center По центру - Justify По ширине - Top Прижать к верхнему краю - Botom Прижать к нижнему краю - horizontal горизонтально - vertical вертикально @@ -410,7 +379,6 @@ p, li { white-space: pre-wrap; } LimeReport::BandDesignIntf - connected to соединён с @@ -418,97 +386,77 @@ p, li { white-space: pre-wrap; } LimeReport::ConnectionDialog - - Connection Соединение - Connection Name Название - Driver Драйвер - Server Сервер - User Пользователь - Password Пароль - Database База данных - - ... - - - - Auto connect Автоматическое соединение - Check connection Проверить соединение - Cancel Отмена - - Ok - - - - - Error Ошибка - Connection succsesfully established! Соединение успешно установлено! - Connection Name is empty Наименование соединения не указано - Connection with name Соединение - already exists уже существует + + ... + + + + Ok + + LimeReport::ContentItemDesignIntf - Variable %1 not found Переменная %1 не найдена @@ -516,7 +464,6 @@ p, li { white-space: pre-wrap; } LimeReport::DataBand - Data Данные @@ -524,127 +471,91 @@ p, li { white-space: pre-wrap; } LimeReport::DataBrowser - - - Datasources Источники данных - Add database connection Добавить соединение с базой - - - - - - - - - - - - - ... - - - - Add new datasource Добавить новый источник данных - View data Просмотр данных в источнике - Change datasource Изменить источник данных - Delete datasource Удалить источник данных - Show error Показать ошибки - Variables Переменные - Add new variable Добавить новую переменную - Edit variable Редактировать переменную - Delete variable Удалить переменную - - - - Attention Внимание - Do you really want to delete "%1" connection ? Do you really want delete "%1" connection ? Вы действительно хотите удалить "%1" соединение ? - User variables Пользовательские переменные - System variables Системные переменные - Do you really want to delete "%1" datasource ? Do you really want delete "%1" datasource ? Вы действительно хотите удалить источник данных "%1" ? - - - Do you really want to delete variable "%1" ? - - Do you really want delete variable "%1" ? Вы действительно хотите удалить переменную "%1" ? - Error Ошибка + + ... + + + + Do you really want to delete variable "%1" ? + + LimeReport::DataFooterBand - DataFooter Подвал данных @@ -652,7 +563,6 @@ p, li { white-space: pre-wrap; } LimeReport::DataHeaderBand - DataHeader Заголовок данных @@ -660,50 +570,38 @@ p, li { white-space: pre-wrap; } LimeReport::DataSourceManager - Connection "%1" is not open Соединение "%1" не открыто - - Variable "%1" not found! - - - - - Datasource "%1" not found ! Источник данных "%1" не найден ! - connection with name "%1" already exists ! соединение "%1" уже существует ! - - - - datasource with name "%1" already exists ! data source with name "%1" already exists !! источник данных "%1" уже существует ! - invalid connection нет соединения + + Variable "%1" not found! + + LimeReport::DataSourceModel - Datasources Источники данных - Variables Переменные @@ -711,17 +609,14 @@ p, li { white-space: pre-wrap; } LimeReport::FontEditorWidget - Font bold Жирный - Font Italic Курсив - Font Underline Подчеркнутый @@ -729,27 +624,22 @@ p, li { white-space: pre-wrap; } LimeReport::FontPropItem - bold жирный - italic курсив - underline подчеркнутый - size размер - family название @@ -757,7 +647,6 @@ p, li { white-space: pre-wrap; } LimeReport::GroupBandFooter - GroupFooter Подвал группы @@ -765,7 +654,6 @@ p, li { white-space: pre-wrap; } LimeReport::GroupBandHeader - GroupHeader Заголовок группы @@ -773,17 +661,14 @@ p, li { white-space: pre-wrap; } LimeReport::GroupFunction - Field "%1" not found Поле "%1" не найдено - Variable "%1" not found Переменная "%1" не найдена - Item "%1" not found Элемент "%1" не найден @@ -791,7 +676,6 @@ p, li { white-space: pre-wrap; } LimeReport::ImageItem - Image Изображение @@ -799,52 +683,42 @@ p, li { white-space: pre-wrap; } LimeReport::ItemsAlignmentEditorWidget - Bring to top На передний план - Send to back На задний план - Align to left Выровнять по левому краю - Align to right Выровнять по правому краю - Align to vertical center Центрировать вертикально - Align to top Выровнять по верхнему краю - Align to bottom Выровнять по нижнему краю - Align to horizontal center Центрировать горизонтально - Set same height Одинаковая высота - Set same width Одинаковая ширина @@ -852,32 +726,26 @@ p, li { white-space: pre-wrap; } LimeReport::ItemsBordersEditorWidget - Top line Верхняя граница - Bottom line Нижняя граница - Left line Левая граница - Right line Правая граница - No borders Удалить границы - All borders Внешние границы @@ -885,12 +753,10 @@ p, li { white-space: pre-wrap; } LimeReport::MasterDetailProxyModel - Field: "%1" not found in "%2" child datasource Поле: "%1" не найдено в подчиненном источнике данных "%2" - Field: "%1" not found in "%2" master datasource Поле: "%1" не найдено в главном источнике данных "%2" @@ -898,7 +764,6 @@ p, li { white-space: pre-wrap; } LimeReport::ModelToDataSource - model is destroyed модель уничтожена @@ -906,7 +771,6 @@ p, li { white-space: pre-wrap; } LimeReport::ObjectBrowser - Objects Объекты @@ -925,7 +789,6 @@ p, li { white-space: pre-wrap; } LimeReport::PageFooter - Page Footer Нижний колонтитул @@ -933,7 +796,6 @@ p, li { white-space: pre-wrap; } LimeReport::PageHeader - Page Header Верхний колонтитул @@ -941,126 +803,97 @@ p, li { white-space: pre-wrap; } LimeReport::PreviewReportWindow - - Preview - - - - View Просмотр - Report Отчет - toolBar Панель инструментов - Print Печать - - Ctrl+P - - - - Zoom In Увеличить - Zoom Out Уменьшить - - Prior Page Предыдущая страница - - Next Page Следующая страница - - Close Preview Закрыть - Edit Mode Режим редактирования - - Save to file Записать в файл - - Show errors Показать ошибки - First Page Первая страница - First page Первая страница - - Last Page Последняя страница - Print To PDF Печать в PDF - Page: Страница: - of %1 из %1 - Report file name Файл отчета - PDF file name Имя PDF файла + + Preview + + + + Ctrl+P + + LimeReport::ProxyHolder - Datasource has been invalidated Источник данных находится в недействительном состоянии @@ -1068,264 +901,209 @@ p, li { white-space: pre-wrap; } LimeReport::QObjectPropertyModel - Property Name Свойство - Property value Значение - leftMargin Отступ левый - rightMargin Отступ правый - topMargin Отступ верхний - bottomMargin Отступ нижний - objectName Имя объекта - borders Границы - geometry Геометрия - itemAlign Расположение объекта - pageOrientation Ориентация страницы - pageSize Размер страницы - TopLine Верхняя граница - BottomLine Нижняя граница - LeftLine Левая граница - RightLine Правая граница - - reprintOnEachPage - - - - - borderLineSize - - - - - autoHeight - - - - - backgroundColor - - - - - columnCount - - - - - columnsFillDirection - - - - datasource источник данных - - keepBottomSpace - - - - - keepFooterTogether - - - - - keepSubdetailTogether - - - - - printIfEmpty - - - - - sliceLastRow - - - - - splittable - - - - alignment расположение - - angle - - - - - autoWidth - - - - - backgroundMode - - - - - backgroundOpacity - - - - content содержимое - - font - - - - - fontColor - - - - - foregroundOpacity - - - - itemLocation Расположение объекта - + Warning + Предупреждение + + + reprintOnEachPage + + + + borderLineSize + + + + autoHeight + + + + backgroundColor + + + + columnCount + + + + columnsFillDirection + + + + keepBottomSpace + + + + keepFooterTogether + + + + keepSubdetailTogether + + + + printIfEmpty + + + + sliceLastRow + + + + splittable + + + + angle + + + + autoWidth + + + + backgroundMode + + + + backgroundOpacity + + + + font + + + + fontColor + + + + foregroundOpacity + + + margin - stretchToMaxHeight - trimValue - lineWidth - opacity - penStyle - shape - shapeBrush - shapeBrushColor - - - Warning - Предупреждение - LimeReport::RectMMPropItem - - - width ширина - - - height высота @@ -1333,12 +1111,10 @@ p, li { white-space: pre-wrap; } LimeReport::RectPropItem - width ширина - height высота @@ -1346,7 +1122,6 @@ p, li { white-space: pre-wrap; } LimeReport::ReportDesignWidget - Report file name Файл отчета @@ -1354,281 +1129,233 @@ p, li { white-space: pre-wrap; } LimeReport::ReportDesignWindow - New Report Новый отчет - Edit Mode Режим редактирования - Undo Отменить действие - Redo Повторить действие - Copy Копировать - Paste Вставить - Cut Вырезать - Settings Настройки - Use grid Использовать сетку - - Use magnet - - - - Text Item Текстовый элемент - Save Report Сохранить отчет - Save Report As Сохранить отчет как - Load Report Загрузить отчет - Delete item Удалить элемент - Zoom In Увеличить - Zoom Out Уменьшить - Render Report Сгенерировать отчет - Edit layouts mode Режим редактирования группировок - Horizontal layout Горизонтальная группировка - About О программе - Hide left panel Спрятать левую панель - Hide right panel Спрятать правую панель - Report Tools Элементы отчета - Main Tools Основные инструменты - Font Шрифт - Text alignment Выравнивание текста - Items alignment Выравнивание объектов - Borders Границы - Report bands Банды - Report Header Заголовок отчета - Report Footer Завершение отчета - Page Header Верхний колонтитул - Page Footer Нижний колонтитул - Data Данные - Data Header Заголовок данных - Data Footer Завершение данных - SubDetail Подчиненные данные - SubDetailHeader Заголовок подчиненных данных - SubDetailFooter Завершение подчиненных данных - GroupHeader Заголовок группы - GroupFooter Завершение группы - File Файл - Edit Правка - Info Информация - - Recent Files - - - - Object Inspector Инспектор объектов - Report structure Структура отчета - Data Browser Инспектор данных - Report has been modified ! Do you want save the report ? Отчет был изменен ! Хотите его записать ? - - Report file name Файл отчета - Rendering report Создается отчет - Abort О генераторе - page rendered создается страница + + Warning + Предупреждение + + + Use magnet + + + + Recent Files + + + + File "%1" not found! + + LimeReport::ReportEnginePrivate - Error Ошибка @@ -1636,7 +1363,6 @@ p, li { white-space: pre-wrap; } LimeReport::ReportFooter - Report Footer Завершение отчета @@ -1644,7 +1370,6 @@ p, li { white-space: pre-wrap; } LimeReport::ReportHeader - Report Header Заголовок отчета @@ -1652,17 +1377,14 @@ p, li { white-space: pre-wrap; } LimeReport::ReportRender - Error Ошибка - Databand "%1" not found Банд "%1" не найден - Wrong using function %1 Не правильное использование функции %1 @@ -1670,165 +1392,125 @@ p, li { white-space: pre-wrap; } LimeReport::SQLEditDialog - Datasource Источник данных - Connection Соединение - Datasource Name Имя источника - Subdetail Подчиненный - Master datasource Главный источник - Subquery mode Режим подзапроса - Filter mode Режим фильтрации - SQL SQL запрос - - - Preview - - - - Hide Preview Скрыть - Child datasource Подчиненный источник - Fields map Поля для связи источников - - - ... - - - - Data preview Данные - Cancel Отмена - - Ok - - - - Error Ошибка - Datasource Name is empty ! Имя источника данных не заполнено ! - SQL is empty ! SQL запрос пустой ! - Datasource with name: "%1" already exists ! Источник данных с именем: "%1" уже существует ! - Datasource with name %1 already exist Источник данных с именем: "%1" уже существует - - Attention Внимание - Connection is not specified Соединение не указано - Refresh Обновить + + Preview + + + + ... + + + + Ok + + LimeReport::ScriptEngineManager - FieldName Имя поля - - BandName Имя банда - - - - Value Значение - - - - Format Формат - Precision Точность - Locale @@ -1836,27 +1518,22 @@ p, li { white-space: pre-wrap; } LimeReport::SettingDialog - Designer setting Настройки дизайнера - Default font Шрифт по умолчанию - Grid Сетка - Vertical grid step Вертикальный шаг - Horizontal grid step Горизонтальный шаг @@ -1864,7 +1541,6 @@ p, li { white-space: pre-wrap; } LimeReport::SubDetailBand - SubDetail Подчиненные данные @@ -1872,7 +1548,6 @@ p, li { white-space: pre-wrap; } LimeReport::SubDetailHeaderBand - SubDetailHeader Заголовок подчиненных данных @@ -1880,33 +1555,26 @@ p, li { white-space: pre-wrap; } LimeReport::TextAlignmentEditorWidget - Text align left По левому краю - - Text align center По центру - Text align right По правому краю - Text align justify По ширине - Text align top Прижать к верхнему краю - Text align bottom Прижать к нижнему краю @@ -1914,57 +1582,46 @@ p, li { white-space: pre-wrap; } LimeReport::TextItemEditor - Text Item Editor Редактор текстового элемента - Content Содержимое - - Data - - - - Functions Функции - Editor settings Настройки - Editor font Шрифт редактора - - ... - - - - - Ok - - - - - Ctrl+Return - - - - Cancel Отмена - + Data + + + + ... + + + + Ok + + + + Ctrl+Return + + + Esc @@ -2059,109 +1716,82 @@ p, li { white-space: pre-wrap; } QObject - - Data Данные - DataHeader Заголовок данных - DataFooter Завершение данных - GroupHeader Заголовок группы - GroupFooter Завершение группы - - Page Footer Нижний колонтитул - - Page Header Верхний колонтитул - - Report Footer Завершение отчета - - Report Header Заголовок отчета - - SubDetail Подчиненные данные - SubDetailHeader Заголовок подчиненных данных - SubDetailFooter Завершение подчиненных данных - alignment расположение - Barcode Item Элемент штрих код - HLayout Горизонтальная компоновка - Image Item Элемент изображение - Shape Item Элемент фигура - itemLocation Расположение объекта - Text Item Текстовый элемент - - Invalid connection! %1 Неверное соединение %1 @@ -2170,143 +1800,61 @@ p, li { white-space: pre-wrap; } Главный источник данных "%1" не найден! - - Master datasource "%1" not found!!! - - - - - Master datasouce "%1" not found! - - - - Child Подчиненный - and child и подчиненный - datasouce "%1" not found! источник данных "%1" не найден ! - Attention! Внимание! - Selected elements have different parent containers Выделенные элементы имеют различные родительские контейнеры - Object with name %1 already exists Объект с именем %1 уже существует - Function %1 not found or have wrong arguments Функция %1 не найдена или вызвана с неверными аргументами - - bool - - - - - QColor - - - - - datasource источник данных - - field Поле - enum Перечисление - flags Флаги - - QFont - - - - - QImage - - - - - int - - - - - - qreal - - - - - QRect - - - - - QRectF - - - - geometry Геометрия - mm мм - - QString - - - - File %1 not opened Файл %1 не открыт - - - Content string is empty - - - - - Content is empty - - TopLine Верхняя граница @@ -2324,10 +1872,61 @@ p, li { white-space: pre-wrap; } Правая граница - content содержимое + + Master datasource "%1" not found!!! + + + + Master datasouce "%1" not found! + + + + bool + + + + QColor + + + + QFont + + + + QImage + + + + int + + + + qreal + + + + QRect + + + + QRectF + + + + QString + + + + Content string is empty + + + + Content is empty + + SQLEditDialog