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 0000000..5e99f05 Binary files /dev/null and b/translations/limereport_es_ES.qm differ 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 7960869..1f378b9 100644 Binary files a/translations/limereport_ru.qm and b/translations/limereport_ru.qm differ diff --git a/translations/limereport_ru.ts b/translations/limereport_ru.ts index 14f6c92..31ecc0a 100644 --- a/translations/limereport_ru.ts +++ b/translations/limereport_ru.ts @@ -137,27 +137,22 @@ 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