diff --git a/.appveyor.yml b/.appveyor.yml index ccfaa11..4dde5bf 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,5 +4,6 @@ install: - set QTDIR=C:\Qt\5.12\mingw73_64 - set PATH=%QTDIR%\bin;C:\Qt\Tools\mingw730_64\bin;%PATH% build_script: + - git fetch --prune --tags - qmake LimeReport.pro - mingw32-make diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..a848c3e --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +limereport/version.h.in export-subst diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 1578466..699aa11 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -23,7 +23,14 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 + with: + fetch-tags: true + + # https://github.com/actions/checkout/issues/1781 + # workaround https://github.com/actions/checkout/issues/1471#issuecomment-1755560284 + - name: Fetch tags + run: git fetch --prune --unshallow --tags - name: Install Qt uses: jurplel/install-qt-action@v3 @@ -57,7 +64,14 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 + with: + fetch-tags: true + + # https://github.com/actions/checkout/issues/1781 + # workaround https://github.com/actions/checkout/issues/1471#issuecomment-1755560284 + - name: Fetch tags + run: git fetch --prune --unshallow --tags - name: Install Qt uses: jurplel/install-qt-action@v3 @@ -94,8 +108,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 - + uses: actions/checkout@v4 + with: + fetch-tags: true + - name: Install MinGW-w64 packages Qt5 if: "startsWith(matrix.qt_version, '5')" uses: msys2/setup-msys2@v2 @@ -107,6 +123,7 @@ jobs: cc:p cmake:p ninja:p + git: qt${{ matrix.qt_version }}-base:p qt${{ matrix.qt_version }}-svg:p qt${{ matrix.qt_version }}-tools:p @@ -123,10 +140,16 @@ jobs: cc:p cmake:p ninja:p + git: qt${{ matrix.qt_version }}-base:p qt${{ matrix.qt_version }}-svg:p qt${{ matrix.qt_version }}-tools:p qt${{ matrix.qt_version }}-declarative:p + + # https://github.com/actions/checkout/issues/1781 + # workaround https://github.com/actions/checkout/issues/1471#issuecomment-1755560284 + - name: Fetch tags + run: git fetch --prune --unshallow --tags - name: Configure CMake for Qt5 if: "startsWith(matrix.qt_version, '5')" @@ -151,7 +174,14 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 + with: + fetch-tags: true + + # https://github.com/actions/checkout/issues/1781 + # workaround https://github.com/actions/checkout/issues/1471#issuecomment-1755560284 + - name: Fetch tags + run: git fetch --prune --unshallow --tags - name: Install Qt uses: jurplel/install-qt-action@v3 diff --git a/.gitignore b/.gitignore index 0733bfc..5425e47 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,160 @@ -# C++ objects and libs +# File created using '.gitignore Generator' for Visual Studio Code: https://bit.ly/vscode-gig +# Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode,qtcreator,qt,macos,intellij+iml,cmake,linux,windows +# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,qtcreator,qt,macos,intellij+iml,cmake,linux,windows +### CMake ### +CMakeLists.txt.user +CMakeCache.txt +CMakeFiles +CMakeScripts +Testing +Makefile +cmake_install.cmake +install_manifest.txt +compile_commands.json +CTestTestfile.cmake +_deps + +### CMake Patch ### +# External projects +*-prefix/ + +### Intellij+iml ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij+iml Patch ### +# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 + +*.iml +modules.xml +.idea/misc.xml +*.ipr + +### Linux ### +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### macOS ### +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### macOS Patch ### +# iCloud generated files +*.icloud + +### Qt ### +# C++ objects and libs *.slo *.lo *.o @@ -7,11 +162,14 @@ *.la *.lai *.so +*.so.* *.dll *.dylib # Qt-es - +object_script.*.Release +object_script.*.Debug +*_plugin_import.cpp /.qmake.cache /.qmake.stash *.pro.user @@ -20,17 +178,117 @@ *.qbs.user.* *.moc moc_*.cpp +moc_*.h qrc_*.cpp ui_*.h +*.qmlc +*.jsc Makefile* *build-* *.qm +*.prl + +# Qt unit tests +target_wrapper.* # QtCreator - *.autosave -#QtCtreator Qml +# QtCreator Qml *.qmlproject.user *.qmlproject.user.* + +# QtCreator CMake +CMakeLists.txt.user* + +# QtCreator 4.8< compilation database + +# QtCreator local machine specific files for imported projects +*creator.user* + +*_qmlcache.qrc + +### QtCreator ### +# gitignore for Qt Creator like IDE for pure C/C++ project without Qt +# +# Reference: http://doc.qt.io/qtcreator/creator-project-generic.html + + + +# Qt Creator autogenerated files + + +# A listing of all the files included in the project +*.files + +# Include directories +*.includes + +# Project configuration settings like predefined Macros +*.config + +# Qt Creator settings +*.creator + +# User project settings +*.creator.user* + +# Qt Creator backups + +# Flags for Clang Code Model +*.cxxflags +*.cflags + + +### VisualStudioCode ### +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +!.vscode/*.code-snippets + +# Local History for Visual Studio Code +.history/ + +# Built Visual Studio Code Extensions +*.vsix + +### VisualStudioCode Patch ### +# Ignore all local history of files +.history +.ionide + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,qtcreator,qt,macos,intellij+iml,cmake,linux,windows + +# Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option) + +limereport/version.h /build/ +*.app diff --git a/CMakeLists.txt b/CMakeLists.txt index aff69f8..9b98eca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.14) project(limereport) +set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" "${CMAKE_MODULE_PATH}") +include(GenerateVersionHeader) + set(DEFAULT_ITEM_PADDING 0) -set(LIMEREPORT_VERSION_MAJOR 1) -set(LIMEREPORT_VERSION_MINOR 7) -set(LIMEREPORT_VERSION_RELEASE 14) option(ENABLE_ZINT "Enable libzint build for barcode support" OFF) option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF) @@ -349,14 +349,12 @@ set(EXTRA_FILES ${PROJECT_NAME}/lrpreparedpagesintf.h ) -configure_file(config.h.in config.h @ONLY) - set(GLOBAL_HEADERS ${PROJECT_NAME}/LimeReport ${PROJECT_NAME}/LRCallbackDS ${PROJECT_NAME}/LRDataManager ${PROJECT_NAME}/LRScriptManager - ${CMAKE_CURRENT_BINARY_DIR}/config.h + ${CMAKE_BINARY_DIR}/limereport/version.h ) set(PROJECT_NAME ${PROJECT_NAME}-qt${QT_VERSION_MAJOR}) @@ -371,8 +369,6 @@ else() target_compile_definitions( ${PROJECT_NAME} INTERFACE -DLIMEREPORT_IMPORTS) endif() -target_compile_definitions(${PROJECT_NAME} PUBLIC -DCMAKE_CONFIG) - if(Qt${QT_VERSION_MAJOR}UiTools_FOUND) target_compile_definitions( ${PROJECT_NAME} PRIVATE -DHAVE_UI_LOADER) target_link_libraries( ${PROJECT_NAME} PUBLIC @@ -396,6 +392,7 @@ target_compile_definitions( ${PROJECT_NAME} PRIVATE -DDEFAULT_ITEM_PADDING=${DEF target_include_directories( ${PROJECT_NAME} PRIVATE limereport/ + ${CMAKE_BINARY_DIR}/limereport limereport/base limereport/bands limereport/databrowser diff --git a/cmake/modules/GenerateVersionHeader.cmake b/cmake/modules/GenerateVersionHeader.cmake new file mode 100644 index 0000000..ed62702 --- /dev/null +++ b/cmake/modules/GenerateVersionHeader.cmake @@ -0,0 +1,28 @@ +find_package(Git) + +if(GIT_EXECUTABLE) + # Generate a git-describe version string from Git repository tags + execute_process( + COMMAND ${GIT_EXECUTABLE} describe --tags --dirty + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE GIT_DESCRIBE_VERSION + RESULT_VARIABLE GIT_DESCRIBE_ERROR_CODE + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if(NOT GIT_DESCRIBE_ERROR_CODE) + set(GIT_VERSION ${GIT_DESCRIBE_VERSION}) + endif() +endif() + +# Final fallback: Just use a bogus version string that is semantically older +# than anything else and spit out a warning to the developer. +if(NOT DEFINED GIT_VERSION) + set(GIT_VERSION 0.0.0-unknown) + message(WARNING "Failed to determine version from Git tags. Using default version \"${GIT_VERSION}\".") +endif() + +configure_file( + ${CMAKE_SOURCE_DIR}/limereport/version.h.in + ${CMAKE_BINARY_DIR}/limereport/version.h + @ONLY) + diff --git a/common.pri b/common.pri index e87efa0..53960ec 100644 --- a/common.pri +++ b/common.pri @@ -139,13 +139,6 @@ UI_SOURCES_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/ui OBJECTS_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/obj RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc -LIMEREPORT_VERSION_MAJOR = 1 -LIMEREPORT_VERSION_MINOR = 7 -LIMEREPORT_VERSION_RELEASE = 14 - -LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' -DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" - QT *= xml sql REPORT_PATH = $$PWD/limereport diff --git a/config.h.in b/config.h.in deleted file mode 100644 index dcb5e74..0000000 --- a/config.h.in +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#cmakedefine LIMEREPORT_VERSION_MAJOR "@LIMEREPORT_VERSION_MAJOR@" -#cmakedefine LIMEREPORT_VERSION_MINOR "@LIMEREPORT_VERSION_MINOR@" -#cmakedefine LIMEREPORT_VERSION_RELEASE "@LIMEREPORT_VERSION_RELEASE@" - -#define LIMEREPORT_VERSION_STR LIMEREPORT_VERSION_MAJOR"." LIMEREPORT_VERSION_MINOR"." LIMEREPORT_VERSION_RELEASE diff --git a/console/main.cpp b/console/main.cpp index 12a5085..7d74596 100644 --- a/console/main.cpp +++ b/console/main.cpp @@ -7,6 +7,7 @@ #include #include #include +#include "../limereport/version.h" #ifdef _WIN32 #include diff --git a/limereport/limereport.pri b/limereport/limereport.pri index 1a2817d..a6eca8c 100644 --- a/limereport/limereport.pri +++ b/limereport/limereport.pri @@ -237,3 +237,19 @@ FORMS += \ RESOURCES += \ $$REPORT_PATH/report.qrc \ $$REPORT_PATH/items/items.qrc + +system("git --version") { + LR_VERSION = $$system("git --git-dir=$$PWD/../.git describe --tags --dirty") +} else { + LR_VERSION = "0.0.0-unknown" +} + +VERSION_TEMPLATE = $$PWD/version.h.in + +generateversion.depends = FORCE +generateversion.input = VERSION_TEMPLATE +generateversion.output = $$OUT_PWD/version.h +generateversion.commands = $$QMAKE_STREAM_EDITOR \'s/@GIT_VERSION@/$$LR_VERSION/\' ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +generateversion.CONFIG = no_link target_predeps + +QMAKE_EXTRA_COMPILERS += generateversion diff --git a/limereport/lraboutdialog.cpp b/limereport/lraboutdialog.cpp index 57cddd6..3663e31 100644 --- a/limereport/lraboutdialog.cpp +++ b/limereport/lraboutdialog.cpp @@ -27,9 +27,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * ****************************************************************************/ -#ifdef CMAKE_CONFIG -#include -#endif +#include "version.h" #include "lraboutdialog.h" #include "ui_lraboutdialog.h" diff --git a/limereport/version.h.in b/limereport/version.h.in new file mode 100644 index 0000000..0592268 --- /dev/null +++ b/limereport/version.h.in @@ -0,0 +1,9 @@ +#pragma once + +// git will put "#define GIT_ARCHIVE 1" on the next line inside archives. $Format:%n#define GIT_ARCHIVE 1$ + +#ifdef GIT_ARCHIVE +#define LIMEREPORT_VERSION_STR "$Format:%(describe:tags=true)$" +#else +#define LIMEREPORT_VERSION_STR "@GIT_VERSION@" +#endif diff --git a/translations/limereport_ar.ts b/translations/limereport_ar.ts index 4f982d3..b0f373d 100644 --- a/translations/limereport_ar.ts +++ b/translations/limereport_ar.ts @@ -509,6 +509,109 @@ p, li { white-space: pre-wrap; } + + LimeReport::BorderEditor + + Edit border + + + + Presets + + + + No lines + + + + Outline + + + + Border + + + + ... + + + + Style + + + + No style + + + + Solid + + + + Dash + + + + Dot + + + + Dash dot + + + + Dash dot dot + + + + Width: + + + + 1 + + + + 0.25 + + + + 0.5 + + + + 1.5 + + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + 6 + + + + Color: + + + + Select + + + LimeReport::BorderFrameEditor @@ -1045,18 +1148,6 @@ p, li { white-space: pre-wrap; } HorizontalBar - - LegendAlignTop - - - - LegendAlignCenter - - - - LegendAlignBottom - - TitleAlignLeft @@ -1093,6 +1184,102 @@ p, li { white-space: pre-wrap; } Split + + GridLines + + + + Lines + + + + Solid + + + + NoStyle + + + + Dashed + + + + Dot + + + + DashDot + + + + DashDotDot + + + + Doubled + + + + LegendPoints + + + + LegendLines + + + + LegendAlignRightCenter + + + + LegendAlignRightTop + + + + LegendAlignRightBottom + + + + LegendAlignBottomRight + + + + LegendAlignBottomCenter + + + + LegendAlignBottomLeft + + + + SolidLine + + + + NoPen + + + + DashLine + + + + DotLine + + + + DashDotLine + + + + DashDotDotLine + + + + CustomDashLine + + LimeReport::FlagsPropItem @@ -2222,6 +2409,14 @@ p, li { white-space: pre-wrap; } mixWithPriorPage + + shadow + + + + borderStyle + + LimeReport::RectPropItem @@ -2942,6 +3137,18 @@ This preview is no longer valid. RowIndex + + RoleIndex + + + + RoleName + + + + columnIndex + + LimeReport::SettingDialog @@ -3001,6 +3208,10 @@ This preview is no longer valid. Report settings + + Base Item Padding: + + LimeReport::SubDetailBand diff --git a/translations/limereport_es.ts b/translations/limereport_es.ts index 33c5919..67f1dd5 100644 --- a/translations/limereport_es.ts +++ b/translations/limereport_es.ts @@ -638,7 +638,109 @@ p, li { white-space: pre-wrap; } - + LimeReport::BorderEditor + + Edit border + + + + Presets + + + + No lines + + + + Outline + + + + Border + + + + ... + + + + Style + + + + No style + + + + Solid + + + + Dash + + + + Dot + + + + Dash dot + + + + Dash dot dot + + + + Width: + + + + 1 + + + + 0.25 + + + + 0.5 + + + + 1.5 + + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + 6 + + + + Color: + + + + Select + + + + LimeReport::BorderFrameEditor BorderFrameEditor @@ -1174,18 +1276,6 @@ p, li { white-space: pre-wrap; } HorizontalBar Barra horizontal - - LegendAlignTop - Alinear Leyenda Arriba - - - LegendAlignCenter - Centrar leyenda - - - LegendAlignBottom - Alinear Leyenda Abajo - TitleAlignLeft Alinear titulo a la izquierda @@ -1222,6 +1312,102 @@ p, li { white-space: pre-wrap; } Split + + GridLines + + + + Lines + + + + Solid + + + + NoStyle + + + + Dashed + + + + Dot + + + + DashDot + + + + DashDotDot + + + + Doubled + + + + LegendPoints + + + + LegendLines + + + + LegendAlignRightCenter + + + + LegendAlignRightTop + + + + LegendAlignRightBottom + + + + LegendAlignBottomRight + + + + LegendAlignBottomCenter + + + + LegendAlignBottomLeft + + + + SolidLine + + + + NoPen + + + + DashLine + + + + DotLine + + + + DashDotLine + + + + DashDotDotLine + + + + CustomDashLine + + LimeReport::FlagsPropItem @@ -2351,6 +2537,14 @@ p, li { white-space: pre-wrap; } mixWithPriorPage + + shadow + + + + borderStyle + + LimeReport::RectPropItem @@ -3073,6 +3267,18 @@ Esta vista previa ya no es válida. RowIndex Índice de fila + + RoleIndex + + + + RoleName + + + + columnIndex + + LimeReport::SettingDialog @@ -3132,6 +3338,10 @@ Esta vista previa ya no es válida. Report units + + Base Item Padding: + + LimeReport::SubDetailBand diff --git a/translations/limereport_fr.ts b/translations/limereport_fr.ts index e126f36..3507328 100644 --- a/translations/limereport_fr.ts +++ b/translations/limereport_fr.ts @@ -430,123 +430,123 @@ p, li { white-space: pre-wrap; } LimeReport::BandDesignIntf - + DataBand bande de données - + DataHeaderBand En-tête de données - + DataFooterBand Pied de données - + ReportHeader En-tête de rapport - + ReportFooter Pied de rapport - + PageHeader En-tête de page - + PageFooter Pied de page - + SubDetailBand Sous-détails - + SubDetailHeaderBand En-tête de sous-détails - + SubDetailFooterBand Pied de sous-détails - + GroupBandHeader Groupe d'en-tête - + GroupBandFooter Groupe de pieds - + TearOffBand Bande détachable - + connected to Connecté à - + Bring to top Placer au premier-plan - + Send to back Placer en arrière-plan - + Cut Couper - + Copy Copier - - + + Auto height Hauteur automatique - - + + Splittable Divisible - + + - Keep top space Conserver l'espace supérieur - - + + Keep bottom space Conserver l'espace inférieur - - + + Print if empty Imprimer si vide @@ -554,62 +554,194 @@ p, li { white-space: pre-wrap; } LimeReport::BaseDesignIntf - - + + Lock item geometry Verrouiller la géométrie d'un élément - + Copy Copier - + Cut Couper - + Paste Coller - + Bring to top Placer au premier-plan - + Send to back Placer en arrière-plan - + Create Horizontal Layout Créer une disposition horizontale - + Create Vertical Layout Créer une disposition verticale - + No borders Aucune bordure - + All borders Toutes les bordures - + Edit borders... + + LimeReport::BorderEditor + + + Edit border + + + + + Presets + + + + + No lines + + + + + Outline + + + + + Border + + + + + + + + ... + + + + + Style + + + + + No style + + + + + Solid + + + + + Dash + + + + + Dot + + + + + Dash dot + + + + + Dash dot dot + + + + + Width: + + + + + + 1 + + + + + 0.25 + + + + + 0.5 + + + + + 1.5 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + 6 + + + + + Color: + + + + + Select + + + LimeReport::BorderFrameEditor @@ -626,8 +758,8 @@ p, li { white-space: pre-wrap; } LimeReport::ConnectionDesc - - + + defaultConnection Connexion par défaut @@ -1311,63 +1443,168 @@ p, li { white-space: pre-wrap; } HorizontalBar Barre horizontale + + + GridLines + + + + + Lines + + + + + Solid + + + + + NoStyle + + + + + Dashed + + + + + Dot + + + + + DashDot + + + + + DashDotDot + + + + + Doubled + + + + + LegendPoints + + + + + LegendLines + + + + + LegendAlignRightCenter + + + + + LegendAlignRightTop + + + + + LegendAlignRightBottom + + + + + LegendAlignBottomRight + + + + + LegendAlignBottomCenter + + + + + LegendAlignBottomLeft + + + + + SolidLine + + + + + NoPen + + + + + DashLine + + + + + DotLine + + + + + DashDotLine + + + + + DashDotDotLine + + + + + CustomDashLine + + - LegendAlignTop - Aligner la légende en haut - - - - LegendAlignCenter - Aligner la légende au centre - - - - LegendAlignBottom - Aligner la légende en bas - - - TitleAlignLeft Aligner le titre à gauche - + TitleAlignRight Aligner le titre à droite - + TitleAlignCenter Aligner le titre au centre - + Layout Disposition - + Table Tableau - + Millimeters Millimètres - + Inches Pouces - + Scale Échèlle - + Split Diviser @@ -1637,12 +1874,12 @@ p, li { white-space: pre-wrap; } LimeReport::MasterDetailProxyModel - + Field: "%1" not found in "%2" child datasource Le champ: "%1"est introuvable dans la source de donnée enfant "%2" - + Field: "%1" not found in "%2" master datasource Le champ: "%1"est introuvable dans la source de donnée principale "%2" @@ -1650,7 +1887,7 @@ p, li { white-space: pre-wrap; } LimeReport::ModelToDataSource - + model is destroyed Le modèle a été supprimé @@ -2051,37 +2288,37 @@ p, li { white-space: pre-wrap; } Supprimer - + Printing Impression en cours - + Page: - + Font Police - + Text align Alignement de texte - + of %1 de %1 - + Attention Attention - + The printing is in process L'impresion est en cours @@ -2089,7 +2326,7 @@ p, li { white-space: pre-wrap; } LimeReport::ProxyHolder - + Datasource has been invalidated La source de donnée n'a pas été validée @@ -2774,17 +3011,27 @@ p, li { white-space: pre-wrap; } - + + shadow + + + + + borderStyle + + + + Property Name Propriété - + Property value Valeur - + Warning Avertissement @@ -2832,17 +3079,17 @@ p, li { white-space: pre-wrap; } Traductions - + Report file name Nom du rapport - + Error Erreur - + Wrong file format Format de fichier incorrect @@ -3236,12 +3483,12 @@ p, li { white-space: pre-wrap; } %1 nom de fichier - + Report File Change Nom du fichier changé - + The report file "%1" has changed names or been deleted. This preview is no longer valid. @@ -3250,12 +3497,12 @@ This preview is no longer valid. Cet aperçu n'est plus valide. - + Designer not found! Designer introuvable! - + Language %1 already exists La langue %1 existe déja @@ -3564,13 +3811,13 @@ Cet aperçu n'est plus valide. LimeReport::ScriptEngineContext - + Dialog with name: %1 can`t be created Le dialogue avec le nom "%1" ne peut pas être crée - - + + Error Erreur @@ -3583,20 +3830,20 @@ Cet aperçu n'est plus valide. Fonctions de groupe - - - - - - - - + + + + + + + + Value Valeur - + BandName Nom de la bande @@ -3607,7 +3854,10 @@ Cet aperçu n'est plus valide. - + + + + FieldName Nom du champ @@ -3624,123 +3874,148 @@ Cet aperçu n'est plus valide. Champ "%1 introuvable dans %2! - + SYSTEM Système - - - + + + NUMBER Nombre - - - - - + + + + + Format - + Precision Précision - - - - + + + + Locale Local - - - - - - + + + + + + DATE&TIME Date&Heure - + CurrencySymbol Symbolde de la monnaie - - - - - - - - - - + + + + + + + + + + + + + + + GENERAL General - - - + + + Name Nom - + Datasource Source de donnée - + ValueField Valeur - + KeyField Clé - + KeyFieldValue Valeur de la clé - + + + RowIndex - - - + + + Unique identifier Identifiant unique - - + + Content Contenu - + Indent Indenter - + + + datasourceName Nom de source de donnée + + + RoleIndex + + + + + + RoleName + + + + + columnIndex + + LimeReport::SettingDialog @@ -3814,6 +4089,11 @@ Cet aperçu n'est plus valide. Suppress absent fields and variables warning Effacer les messages d'absences de champs et d'avertissement de variables + + + Base Item Padding: + + LimeReport::SubDetailBand @@ -3884,66 +4164,66 @@ Cet aperçu n'est plus valide. LimeReport::TextItem - - + + Edit Edition - - + + Auto height Hauteur automatique - - + + Allow HTML Interpréter HTML - - + + Allow HTML in fields Interpréter HTML dans les champs - - + + Stretch to max height Etirer à la hauteur maximale - - + + Transparent Transparent - - + + Watermark Filigrane - - + + Hide if empty Masquer si vide - - + + Error Erreur - + TextItem " %1 " already has folower " %2 " L'élément texte " %1 " a toujours un copain " %2 " - + TextItem " %1 " not found! Elément "%1" introuvable! @@ -4191,27 +4471,27 @@ Cet aperçu n'est plus valide. Connexion invalidé %1 - + Master datasource "%1" not found! Source de donnée principale "%1" introuvable! - + Master datasouce "%1" not found! Source de donnée principale "%1" introuvable! - + Child Enfant - + and child est enfant - + datasouce "%1" not found! Source de donnée "%1" introuvable! @@ -4327,12 +4607,14 @@ Cet aperçu n'est plus valide. - + + Attention! - + + Selected elements have different parent containers Les éléments sélectionnés ont un parent différent @@ -4342,12 +4624,12 @@ Cet aperçu n'est plus valide. L'objet avec le nom "%1" existe déja! - + Function %1 not found or have wrong arguments La fonction %1 est introuvable ou contient des paramètres incorrects - + Datasource manager not found Gestionnaire de source de donnée introuvable @@ -4438,20 +4720,20 @@ Cet aperçu n'est plus valide. Clair - + Default par défaut - - - + + + Millimeters Millimètres - - + + Inches Pouces diff --git a/translations/limereport_pl.ts b/translations/limereport_pl.ts index 40c3860..14d7193 100644 --- a/translations/limereport_pl.ts +++ b/translations/limereport_pl.ts @@ -442,123 +442,123 @@ p, li { white-space: pre-wrap; } LimeReport::BandDesignIntf - + DataBand Sekcja danych - + DataHeaderBand Nagłówek sekcji danych - + DataFooterBand Stopka sekcji danych - + ReportHeader Nagłówek raportu - + ReportFooter Stopka raportu - + PageHeader Nagłówek strony - + PageFooter Stopka strony - + SubDetailBand Podsekcja danych - + SubDetailHeaderBand Podsekcja danych nagłówek - + SubDetailFooterBand Podsekcja danych stopka - + GroupBandHeader Nagłówek sekcji grupowania - + GroupBandFooter Stopka sekcji grupowania - + TearOffBand Urwanie sekcji - + connected to połączony do - + Bring to top Przenieś na górę - + Send to back Przenieś na dół - + Cut Wytnij - + Copy Kopiuj - - + + Auto height Automatyczna wysokość - - + + Splittable Rozdzielane - + + - Keep top space - - + + Keep bottom space Zachowaj dolną przestrzeń - - + + Print if empty Drukuj jeśli pusty @@ -566,64 +566,195 @@ p, li { white-space: pre-wrap; } LimeReport::BaseDesignIntf - - + + Lock item geometry Zablokuj geometrię pozycji - + Copy Kopiuj - + Cut Wytnij - + Paste Wklej - + Bring to top Przenieś na górę - + Send to back Przenieś na dół - + Create Horizontal Layout Utwórz układ poziomy - + Create Vertical Layout Utwórz układ pionowy - + No borders Bez obramowania - + All borders Pełne obramowanie - + Edit borders... - + LimeReport::BorderEditor + + + Edit border + + + + + Presets + + + + + No lines + + + + + Outline + + + + + Border + + + + + + + + ... + ... + + + + Style + + + + + No style + + + + + Solid + + + + + Dash + + + + + Dot + + + + + Dash dot + + + + + Dash dot dot + + + + + Width: + + + + + + 1 + + + + + 0.25 + + + + + 0.5 + + + + + 1.5 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + 6 + + + + + Color: + + + + + Select + + + + LimeReport::BorderFrameEditor @@ -639,8 +770,8 @@ p, li { white-space: pre-wrap; } LimeReport::ConnectionDesc - - + + defaultConnection Domyślne połączenie @@ -1324,63 +1455,168 @@ p, li { white-space: pre-wrap; } HorizontalBar Pasek poziomy + + + GridLines + + + + + Lines + + + + + Solid + + + + + NoStyle + + + + + Dashed + + + + + Dot + + + + + DashDot + + + + + DashDotDot + + + + + Doubled + + + + + LegendPoints + + + + + LegendLines + + + + + LegendAlignRightCenter + + + + + LegendAlignRightTop + + + + + LegendAlignRightBottom + + + + + LegendAlignBottomRight + + + + + LegendAlignBottomCenter + + + + + LegendAlignBottomLeft + + + + + SolidLine + + + + + NoPen + + + + + DashLine + + + + + DotLine + + + + + DashDotLine + + + + + DashDotDotLine + + + + + CustomDashLine + + - LegendAlignTop - Wyrównaj do góry legendę - - - - LegendAlignCenter - Wyśrodkuj legendę - - - - LegendAlignBottom - Wyrównaj do dołu legendę - - - TitleAlignLeft Wyrównaj do lewej tytuł - + TitleAlignRight Wyrównaj do prawej tytuł - + TitleAlignCenter Wyśrodkuj tytuł - + Layout Układ - + Table Tabela - + Millimeters Milimetry - + Inches Cale - + Scale Skala - + Split Podział @@ -1650,12 +1886,12 @@ p, li { white-space: pre-wrap; } LimeReport::MasterDetailProxyModel - + Field: "%1" not found in "%2" child datasource Pole: "%1" nie znalezione w "%2" źródle danch dziecka - + Field: "%1" not found in "%2" master datasource Pole: "%1" nie znalezione w "%2" głównym źródle danch @@ -1663,7 +1899,7 @@ p, li { white-space: pre-wrap; } LimeReport::ModelToDataSource - + model is destroyed Model danych jest zniszczony @@ -2064,37 +2300,37 @@ p, li { white-space: pre-wrap; } Usuń - + Printing - + Page: Strona: - + Font Czcionka - + Text align Wyrównanie tekstu - + of %1 z %1 - + Attention Uwaga - + The printing is in process @@ -2102,7 +2338,7 @@ p, li { white-space: pre-wrap; } LimeReport::ProxyHolder - + Datasource has been invalidated Źródło danych zostało unieważnione @@ -2787,17 +3023,27 @@ p, li { white-space: pre-wrap; } - + + shadow + + + + + borderStyle + + + + Property Name Nazwa właściwości - + Property value Wartość właściwości - + Warning Uwaga @@ -2845,17 +3091,17 @@ p, li { white-space: pre-wrap; } Tłumaczenia - + Report file name Nazwa pliku raportu - + Error Błąd - + Wrong file format Zły format pliku @@ -3249,12 +3495,12 @@ p, li { white-space: pre-wrap; } %1 nazwa pliku - + Report File Change Zmiana pliku raportu - + The report file "%1" has changed names or been deleted. This preview is no longer valid. @@ -3263,12 +3509,12 @@ This preview is no longer valid. Ten podgląd nie jest już prawidłowy. - + Designer not found! Nie znaleziono projektanta! - + Language %1 already exists Język %1 już istnieje @@ -3577,13 +3823,13 @@ Ten podgląd nie jest już prawidłowy. LimeReport::ScriptEngineContext - + Dialog with name: %1 can`t be created Okno dialogowe z nazwą:%1 nie można utworzyć - - + + Error Błąd @@ -3596,20 +3842,20 @@ Ten podgląd nie jest już prawidłowy. FUNKCJE GRUPUJĄCE - - - - - - - - + + + + + + + + Value Wartość - + BandName Nazwa sekcji @@ -3620,7 +3866,10 @@ Ten podgląd nie jest już prawidłowy. - + + + + FieldName Nazwa pola @@ -3637,120 +3886,145 @@ Ten podgląd nie jest już prawidłowy. Pole %1 nie znalezione w %2! - + SYSTEM SYSTEM - - - + + + NUMBER LICZBA - - - - - + + + + + Format Format - + Precision Precyzja - - - - + + + + Locale Ustawienia lokalne - - - - - - + + + + + + DATE&TIME Data i czas - + Datasource Źródło danych - + ValueField Pole wartości - + KeyField Pole klucza - + KeyFieldValue Wartość pola klucza - + + + RowIndex Indeks wiersza - - - + + + Unique identifier Unikalny identyfikator - - + + Content Zawartość - + Indent Akapit - + + + datasourceName Nazwa źródła danych - + + RoleIndex + + + + + + RoleName + + + + + columnIndex + + + + CurrencySymbol Symbol waluty - - - - - - - - - - + + + + + + + + + + + + + + + GENERAL OGÓLNY - - - + + + Name Nazwa @@ -3827,6 +4101,11 @@ Ten podgląd nie jest już prawidłowy. Suppress absent fields and variables warning Pomiń ostrzerzenie o nieobecności pól i zmiennych + + + Base Item Padding: + + LimeReport::SubDetailBand @@ -3897,66 +4176,66 @@ Ten podgląd nie jest już prawidłowy. LimeReport::TextItem - - + + Edit Edycja - - + + Auto height Automatyczna wysokość - - + + Allow HTML Zezwalaj HTML - - + + Allow HTML in fields Zezwalaj HTML w polach - - + + Stretch to max height Rozciągnij się do maksymalnej wysokości - - + + Transparent Przezroczysty - - + + Watermark Znak wodny - - + + Hide if empty Ukryj jeśli pusty - - + + Error Błąd - + TextItem " %1 " already has folower " %2 " Pole tekstowe " %1 " już ma folower " %2 " - + TextItem " %1 " not found! Nie znaleziono pole tekstowego "%1"! @@ -4204,27 +4483,27 @@ Ten podgląd nie jest już prawidłowy. Nieprawidłowe połączenie! %1 - + Master datasource "%1" not found! Nie znaleziono głównego źródła danych "%1"! - + Master datasouce "%1" not found! Nie znaleziono głównego źródła danych "%1"! - + Child Dziecko - + and child i dziecko - + datasouce "%1" not found! nie znaleziono źródła danych "%1"! @@ -4340,12 +4619,14 @@ Ten podgląd nie jest już prawidłowy. Ciąg znaków - + + Attention! Uwaga! - + + Selected elements have different parent containers Wybrane elementy mają różne pojemniki nadrzędne @@ -4355,12 +4636,12 @@ Ten podgląd nie jest już prawidłowy. Obiekt o nazwie %1 już istnieje! - + Function %1 not found or have wrong arguments Funkcja %1 nie znaleziona lub ma błędne argumenty - + Datasource manager not found Nie znaleziono menedżera źródła danych @@ -4451,20 +4732,20 @@ Ten podgląd nie jest już prawidłowy. Jasny - + Default Domyślny - - - + + + Millimeters Milimetry - - + + Inches Cale diff --git a/translations/limereport_ru.qm b/translations/limereport_ru.qm deleted file mode 100644 index dbc8844..0000000 Binary files a/translations/limereport_ru.qm and /dev/null differ diff --git a/translations/limereport_ru.ts b/translations/limereport_ru.ts index 0784782..ceeec76 100644 --- a/translations/limereport_ru.ts +++ b/translations/limereport_ru.ts @@ -559,58 +559,58 @@ p, li { white-space: pre-wrap; } LimeReport::BaseDesignIntf - + Copy Копировать - + Cut Вырезать - + Paste Вставить - + Bring to top На передний план - + Send to back На задний план - + No borders Удалить границы - + All borders Внешние границы - + Create Horizontal Layout Создать Горизонтальную Компановку - + Create Vertical Layout Создать Вертикальную Компановку - - + + Lock item geometry Заблокировать геометрию элемента - + Edit borders... Редактор границ ... @@ -763,8 +763,8 @@ p, li { white-space: pre-wrap; } LimeReport::ConnectionDesc - - + + defaultConnection Соединение по умолчанию @@ -1879,12 +1879,12 @@ 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" @@ -1892,7 +1892,7 @@ p, li { white-space: pre-wrap; } LimeReport::ModelToDataSource - + model is destroyed модель уничтожена @@ -2213,12 +2213,12 @@ p, li { white-space: pre-wrap; } Печать в PDF - + Page: Страница: - + of %1 из %1 @@ -2258,12 +2258,12 @@ p, li { white-space: pre-wrap; } Показать панель инструментов - + Font Шрифт - + Text align Выравнивание текста @@ -2313,17 +2313,17 @@ p, li { white-space: pre-wrap; } Панель инструментов редактирования - + Printing Печатается - + Attention Внимание - + The printing is in process Отчет находится в процессе печати @@ -2331,7 +2331,7 @@ p, li { white-space: pre-wrap; } LimeReport::ProxyHolder - + Datasource has been invalidated Источник данных недействителен @@ -3074,7 +3074,7 @@ p, li { white-space: pre-wrap; } LimeReport::ReportDesignWidget - + Report file name Имя файла отчета @@ -3084,12 +3084,12 @@ p, li { white-space: pre-wrap; } Скрипт - + Error Ошибка - + Wrong file format Неверный формат файла @@ -3483,24 +3483,24 @@ p, li { white-space: pre-wrap; } Предпросмотр - + Report File Change Монитор изменений файлов - + The report file "%1" has changed names or been deleted. This preview is no longer valid. Файл отчета "%1" изменил имя или был удален. - + Designer not found! Дизайнер не найден! - + Language %1 already exists Язык %1 уже существует @@ -3814,13 +3814,13 @@ This preview is no longer valid. LimeReport::ScriptEngineContext - + Dialog with name: %1 can`t be created Диалог %1 не может быть создан - - + + Error Ошибка @@ -3923,6 +3923,11 @@ This preview is no longer valid. + + + + + GENERAL ОБЩИЕ @@ -3934,6 +3939,9 @@ This preview is no longer valid. + + + FieldName Имя поля @@ -3983,11 +3991,31 @@ This preview is no longer valid. + + datasourceName Имя источника данных + + + RoleIndex + + + + + + RoleName + + + + + columnIndex + + + + RowIndex Индекс строки @@ -4024,6 +4052,11 @@ This preview is no longer valid. Suppress absent fields and variables warning Не выводить сообщения об отсутствии полей или переменных + + + Base Item Padding: + + Language @@ -4134,66 +4167,66 @@ This preview is no longer valid. LimeReport::TextItem - - + + Edit Правка - - + + Auto height Автоматическая высота - - + + Allow HTML Разрешить HTML - - + + Allow HTML in fields Разрешить HTML в полях - - + + Stretch to max height Растягивать до максимальной высоты - - + + Error Ошибка - + TextItem " %1 " already has folower " %2 " Текстовый элемент %1 уже следует за %2 - + TextItem " %1 " not found! Текстовый элемент %1 не найден! - - + + Transparent Прозрачный - - + + Watermark Водный знак - - + + Hide if empty Скрывать, если пустое @@ -4440,34 +4473,34 @@ This preview is no longer valid. Неверное соединение %1 - + Child Подчиненный - + and child и подчиненный - + datasouce "%1" not found! источник данных %1 не найден! - - + + Attention! Внимание! - - + + Selected elements have different parent containers Выделенные элементы имеют различные родительские контейнеры - + Function %1 not found or have wrong arguments Функция %1 не найдена или вызвана с неверными аргументами @@ -4532,7 +4565,7 @@ This preview is no longer valid. содержимое - + Master datasouce "%1" not found! Главный источник данных %1 не найден! @@ -4614,7 +4647,7 @@ This preview is no longer valid. Неверный формат файла - + Master datasource "%1" not found! Главный источник данных %1 не найден! @@ -4645,7 +4678,7 @@ This preview is no longer valid. Третий - + Datasource manager not found Менеджер источников данных не найден @@ -4666,20 +4699,20 @@ This preview is no longer valid. Светаля - + Default По умолчанию - - - + + + Millimeters Миллиметры - - + + Inches Дюймы diff --git a/translations/limereport_zh.ts b/translations/limereport_zh.ts index d96250c..7649beb 100644 --- a/translations/limereport_zh.ts +++ b/translations/limereport_zh.ts @@ -522,7 +522,109 @@ p, li { white-space: pre-wrap; } - + LimeReport::BorderEditor + + Edit border + + + + Presets + + + + No lines + + + + Outline + + + + Border + + + + ... + ... + + + Style + + + + No style + + + + Solid + + + + Dash + + + + Dot + + + + Dash dot + + + + Dash dot dot + + + + Width: + + + + 1 + + + + 0.25 + + + + 0.5 + + + + 1.5 + + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + 6 + + + + Color: + + + + Select + + + + LimeReport::BorderFrameEditor BorderFrameEditor @@ -1058,18 +1160,6 @@ p, li { white-space: pre-wrap; } HorizontalBar 条形图 - - LegendAlignTop - 图例靠上对齐 - - - LegendAlignCenter - 图例居中 - - - LegendAlignBottom - 图例靠下对齐 - TitleAlignLeft 标题左对齐 @@ -1106,6 +1196,102 @@ p, li { white-space: pre-wrap; } Split 划分 + + GridLines + + + + Lines + + + + Solid + + + + NoStyle + + + + Dashed + + + + Dot + + + + DashDot + + + + DashDotDot + + + + Doubled + + + + LegendPoints + + + + LegendLines + + + + LegendAlignRightCenter + + + + LegendAlignRightTop + + + + LegendAlignRightBottom + + + + LegendAlignBottomRight + + + + LegendAlignBottomCenter + + + + LegendAlignBottomLeft + + + + SolidLine + + + + NoPen + + + + DashLine + + + + DotLine + + + + DashDotLine + + + + DashDotDotLine + + + + CustomDashLine + + LimeReport::FlagsPropItem @@ -2235,6 +2421,14 @@ p, li { white-space: pre-wrap; } mixWithPriorPage + + shadow + + + + borderStyle + + LimeReport::RectPropItem @@ -2957,6 +3151,18 @@ This preview is no longer valid. RowIndex 行索引 + + RoleIndex + + + + RoleName + + + + columnIndex + + LimeReport::SettingDialog @@ -3016,6 +3222,10 @@ This preview is no longer valid. Report settings 报表设置 + + Base Item Padding: + + LimeReport::SubDetailBand