Compare commits

..

5 Commits

Author SHA1 Message Date
joshua
5f318e09c8 Add forgotten file and folder.
Add folder and file to cmake.
2026-01-30 19:43:07 +01:00
joshua
27afeaefe2 Upgrade pugixml version.
Upgrade pugixml to be compatible with cmake >= 4.0.0.

Compatibility with CMake < 3.5 has been removed from CMake since 4.0.0.
Pugixml V1.11.4 used cmake 3.4. Latest version V1.15 use cmake VERSION
3.5...3.30
2026-01-30 18:46:21 +01:00
joshua
ab2f933fdf Re-enable multi-threading to load collection
The name of the elements and folders of the collection are not displayed
until we hover the item with the mouse.
This due that QtConcurent::run was disabled at loading of collection in
the goal of use QtConcurrent::run with Qt6.
Run is made to run a function once.
Map is made to run a fonction for each item of a sequence (what we need
in this case).
Remove code of run and re-enable code for map.
2026-01-28 19:47:04 +01:00
joshua
7f718f672f Fix : can't open recent file 2026-01-28 00:15:09 +01:00
joshua
9ec02bc088 Build with qt6 and cmake
First build with qt6 and cmake.
QET compil, but a lot of things don't work.
Build tested on debian sid and ubuntu 25.04.

Dependency needed under debian and ubuntu :
qtcreator cmake qt6-tools-dev qt6-svg-dev libsqlite3-dev
libkf6coreaddons-dev extra-cmake-modules libkf6widgetsaddons-dev
2026-01-27 23:31:34 +01:00
41 changed files with 166 additions and 17050 deletions

View File

@@ -10,7 +10,7 @@ jobs:
doxygen: doxygen:
permissions: permissions:
contents: write contents: write
runs-on: ubuntu-latest runs-on: ubuntu-24.04
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -18,7 +18,7 @@ jobs:
submodules: 'recursive' submodules: 'recursive'
show-progress: '' show-progress: ''
- name: Setup and run doxygen - name: Setup and run doxygen
run: sudo apt update && sudo apt install doxygen graphviz qhelpgenerator-qt5 -y run: sudo apt install doxygen graphviz qhelpgenerator-qt5 -y
- name: Set up Git LFS - name: Set up Git LFS
run: | run: |
git lfs install git lfs install

View File

@@ -16,10 +16,10 @@
include(cmake/hoto_update_cmake_message.cmake) include(cmake/hoto_update_cmake_message.cmake)
cmake_minimum_required(VERSION 3.14...3.19 FATAL_ERROR) cmake_minimum_required(VERSION 3.5...4.2)
project(qelectrotech project(qelectrotech
VERSION 0.9.0 VERSION 0.100.0
DESCRIPTION "QET is a CAD/CAE editor focusing on schematics drawing features." DESCRIPTION "QET is a CAD/CAE editor focusing on schematics drawing features."
HOMEPAGE_URL "https://qelectrotech.org/" HOMEPAGE_URL "https://qelectrotech.org/"
LANGUAGES CXX) LANGUAGES CXX)
@@ -27,9 +27,16 @@ project(qelectrotech
include(cmake/copyright_message.cmake) include(cmake/copyright_message.cmake)
set(QET_DIR ${PROJECT_SOURCE_DIR}) set(QET_DIR ${PROJECT_SOURCE_DIR})
include(cmake/qet_compilation_vars.cmake)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(Qt6 REQUIRED COMPONENTS ${QET_COMPONENTS})
qt_standard_project_setup()
# Add sub directories # Add sub directories
option(PACKAGE_TESTS "Build the tests" ON) option(PACKAGE_TESTS "Build the tests" NO)
if(PACKAGE_TESTS) if(PACKAGE_TESTS)
message("Add sub directory tests") message("Add sub directory tests")
add_subdirectory(tests) add_subdirectory(tests)
@@ -43,42 +50,19 @@ include(cmake/git_last_commit_sha.cmake)
include(cmake/fetch_kdeaddons.cmake) include(cmake/fetch_kdeaddons.cmake)
include(cmake/fetch_singleapplication.cmake) include(cmake/fetch_singleapplication.cmake)
include(cmake/fetch_pugixml.cmake) include(cmake/fetch_pugixml.cmake)
include(cmake/qet_compilation_vars.cmake)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
SET(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(
QT
NAMES
Qt6
Qt5
COMPONENTS
${QET_COMPONENTS}
REQUIRED
)
find_package(
Qt${QT_VERSION_MAJOR}
COMPONENTS
${QET_COMPONENTS}
REQUIRED)
set(CMAKE_AUTOUIC_SEARCH_PATHS ${QET_DIR}/sources/ui) set(CMAKE_AUTOUIC_SEARCH_PATHS ${QET_DIR}/sources/ui)
qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${QET_DIR}/lang")
qt5_add_translation(QM_FILES ${TS_FILES})
# als laatse # als laatse
include(cmake/define_definitions.cmake) include(cmake/define_definitions.cmake)
add_executable( find_package(KF6WidgetsAddons REQUIRED)
qt_add_executable(
${PROJECT_NAME} ${PROJECT_NAME}
${QET_RES_FILES} ${QET_RES_FILES}
${QET_SRC_FILES} ${QET_SRC_FILES}
@@ -86,14 +70,26 @@ add_executable(
${QET_DIR}/qelectrotech.qrc ${QET_DIR}/qelectrotech.qrc
) )
if(QMFILES_AS_RESOURCE)
qt_add_translations(${PROJECT_NAME} TS_FILES ${TS_FILES} RESOURCE_PREFIX "/lang")
else()
qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${QET_DIR}/lang")
qt_add_translation(QM_FILES ${TS_FILES})
endif()
find_package(SQLite3 REQUIRED)
target_link_libraries( target_link_libraries(
${PROJECT_NAME} ${PROJECT_NAME}
PUBLIC PUBLIC
PRIVATE PRIVATE
pugixml::pugixml pugixml::pugixml
SingleApplication::SingleApplication SingleApplication::SingleApplication
${KF5_PRIVATE_LIBRARIES} SQLite::SQLite3
${KF6_PRIVATE_LIBRARIES}
${QET_PRIVATE_LIBRARIES} ${QET_PRIVATE_LIBRARIES}
KF6::WidgetsAddons
) )
target_include_directories( target_include_directories(
@@ -130,6 +126,7 @@ target_include_directories(
${QET_DIR}/sources/dataBase/ui ${QET_DIR}/sources/dataBase/ui
${QET_DIR}/sources/factory/ui ${QET_DIR}/sources/factory/ui
${QET_DIR}/sources/print ${QET_DIR}/sources/print
${QET_DIR}/sources/svg
) )
install(TARGETS ${PROJECT_NAME}) install(TARGETS ${PROJECT_NAME})
@@ -149,6 +146,7 @@ install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share
install(FILES misc/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications) install(FILES misc/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications)
install(FILES misc/qelectrotech.xml DESTINATION share/mime/packages) install(FILES misc/qelectrotech.xml DESTINATION share/mime/packages)
install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH}) install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH})
if(NOT QMFILES_AS_RESOURCE)
install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH}) install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})
endif()
endif() endif()

32
CREDIT
View File

@@ -266,35 +266,3 @@ Dank aan Chipsterjulien voor de pakkette Archlinux AUR
Dank aan Elbert voor de pakkette OS/2 Dank aan Elbert voor de pakkette OS/2
Dank aan Zloidemon fvoor de pakkette (port GCC) Dank aan Zloidemon fvoor de pakkette (port GCC)
Dank aan Mrbit van ebuild voor de pakkette Gentoo Dank aan Mrbit van ebuild voor de pakkette Gentoo
[ko]
Qt 라이브러리(Qt Software, http://www.qtsoftware.com/)를 제공해 주신 Qt Software에 감사드립니다. (GNU/GPL 라이선스)
KDE 프로젝트 ( http://www.kde.org/ )에 감사드립니다.
수학적인 설명을 제공해 주신 Loic에게 감사드립니다.
Fedora 패키지를 제공해 주신 Remi Collet에게 감사드립니다.
Debian 패키지를 제공해 주신 Laurent Trinques에게 감사드립니다.
Mandriva 패키지를 제공해 주신 `trem`에게 감사드립니다.
프로젝트 호스팅을 지원해 주신 TuxFamily ( http://tuxfamily.org/ )에 감사드립니다.
요소 제공 및 지원을 해주신 `Nishiki`에게 감사드립니다.
SingleApplication 클래스를 제공해 준 qtcentre.org에 감사드립니다.
스페인어 번역 및 번역 수정에 기여해 주신 Alfredo Carreto ( http://electronicosmx.net )에게 감사드립니다.
이탈리아어 번역에 기여해 주신 'Dr.Slump'와 Silvio에게 감사드립니다.
포르투갈어 번역에 기여해 주신 Jose Carlos Martins에게 감사드립니다.
체코어 번역에 기여해 주신 Pavel Fric에게 감사드립니다.
폴란드어 번역에 기여해 주신 Pawel Smiech에게 감사드립니다.
러시아어 번역에 기여해 주신 Yuriy Litkevich에게 감사드립니다.
카탈로니아어 번역에 기여해 주신 Youssef Ouamalkran에게 감사드립니다.
루마니아어 번역에 기여해 주신 Gabi Mandoc에게 감사드립니다.
독일어 번역에 기여해 주신 Markus Budde, Jonas Stein, Noah Braden에게 감사드립니다.
아랍어 번역에 기여해 주신 Mohamed Souabni에게 감사드립니다.
슬로베니아어 번역에 기여해 주신 Uroš Platiše에게 감사드립니다.
크로아티아어 번역에 기여해 주신 Antun Marakovic에게 감사드립니다.
그리스어 번역에 기여해 주신 Nikos Papadopoylos와 Yannis Gyftomitros에게 감사드립니다.
한국어 번역에 기여해 주신 정광호 님께 감사드립니다.
Gentoo 패키지를 제공해 주신 Markos Chandras에게 감사드립니다.
Slackware 패키지를 제공해 주신 David에게 감사드립니다.
Arch Linux AUR 패키지를 제공해 주신 Chipsterjulien에게 감사드립니다.
OS/2 패키지를 제공해 주신 Elbert에게 감사드립니다.
FreeBSD(GCC 포트) 패키지를 제공해 주신 zloidemon에게 감사드립니다.
Gentoo ebuild 패키지를 제공해 주신 Mrbit에게 감사드립니다.

View File

@@ -214,20 +214,3 @@ QElectroTech と一緒に提供される要素コレクションは現状のま
ライセンスのコピーを見るには http://creativecommons.org/licenses/by/3.0/ にアクセスするか、 ライセンスのコピーを見るには http://creativecommons.org/licenses/by/3.0/ にアクセスするか、
「Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.」に 「Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.」に
手紙を送ってください。 手紙を送ってください。
[ko]
QElectroTech와 함께 제공되는 요소 컬렉션은 “있는 그대로(as is)” 제공되며,
특정 목적에 대한 적합성이나 정상 동작에 대한 어떠한 보증도 제공되지 않습니다.
요소의 사용, 수정 및 전기 도면에의 통합은 도면의 최종 라이선스와 관계없이
아무런 조건 없이 허용됩니다.
본 소프트웨어 또는 관련 파일을 기계 학습(machine learning) 모델을 구축하기 위한
샘플 데이터로 사용하는 것은 허용되지 않습니다.
전기 도면과 분리된 형태로 QElectroTech 요소 컬렉션의 전부 또는 일부를,
수정 여부와 관계없이 재배포하는 경우에는 CC-BY 라이선스 조건을 준수해야 합니다.
본 저작물은 Creative Commons Attribution 3.0 라이선스에 따라 제공됩니다.
라이선스 사본은 다음 주소에서 확인할 수 있습니다.
http://creativecommons.org/licenses/by/3.0/
또는 다음 주소로 서신을 보내실 수 있습니다.
Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.

View File

@@ -109,7 +109,6 @@
; For consistency, we limit the installer to languages supported by QElectroTech itself ; For consistency, we limit the installer to languages supported by QElectroTech itself
!insertmacro MUI_LANGUAGE "English" ;first language is the default language !insertmacro MUI_LANGUAGE "English" ;first language is the default language
!insertmacro MUI_LANGUAGE "Korean"
!insertmacro MUI_LANGUAGE "French" !insertmacro MUI_LANGUAGE "French"
!insertmacro MUI_LANGUAGE "Spanish" !insertmacro MUI_LANGUAGE "Spanish"
!insertmacro MUI_LANGUAGE "Russian" !insertmacro MUI_LANGUAGE "Russian"
@@ -126,6 +125,7 @@
!insertmacro MUI_LANGUAGE "Dutch" !insertmacro MUI_LANGUAGE "Dutch"
!insertmacro MUI_LANGUAGE "Dutch_Belgium" !insertmacro MUI_LANGUAGE "Dutch_Belgium"
!insertmacro MUI_LANGUAGE "Danish" !insertmacro MUI_LANGUAGE "Danish"
!insertmacro MUI_LANGUAGE "Swedish"
!insertmacro MUI_RESERVEFILE_LANGDLL !insertmacro MUI_RESERVEFILE_LANGDLL
!include lang_extra.nsh !include lang_extra.nsh
@@ -405,6 +405,3 @@ Function un.onInit
FunctionEnd FunctionEnd

View File

@@ -19,27 +19,6 @@
LangString var4 ${LANG_ENGLISH} "Examples of diagrams" LangString var4 ${LANG_ENGLISH} "Examples of diagrams"
LangString installed ${LANG_KOREAN} "${SOFT_NAME}이(가) 이미 설치되어 있습니다. $\n$\n이전 버전을 제거하려면 `OK`를, 업그레이드를 취소하려면 `Cancel`을 클릭하세요."
LangString wrongArch ${LANG_KOREAN} "이 배포판은 64비트 컴퓨터에서만 사용할 수 있습니다."
LangString Elements ${LANG_KOREAN} "요소"
LangString Electric ${LANG_KOREAN} "전기"
LangString Logic ${LANG_KOREAN} "로직"
LangString Hydraulic ${LANG_KOREAN} "유압"
LangString Pneumatic ${LANG_KOREAN} "공압"
LangString Energy ${LANG_KOREAN} "에너지"
LangString water ${LANG_KOREAN} ""
LangString Refrigeration ${LANG_KOREAN} "냉동"
LangString Solar_thermal ${LANG_KOREAN} "태양열"
LangString Lang ${LANG_KOREAN} "언어"
LangString Titleblocks ${LANG_KOREAN} "표제란"
LangString Examples ${LANG_KOREAN} "예제"
LangString Check ${LANG_KOREAN} "${SOFT_NAME} 실행"
LangString var1 ${LANG_KOREAN} "공식 컬렉션 요소"
LangString var2 ${LANG_KOREAN} "언어 파일"
LangString var3 ${LANG_KOREAN} "표제란 예제"
LangString var4 ${LANG_KOREAN} "도면 예제"
LangString installed ${LANG_POLISH} "${SOFT_NAME} jest już zainstalowany. $\n$\nKliknij `OK` aby odinstalować poprzednią wersję lub `Anuluj` aby przerwać aktualizację." LangString installed ${LANG_POLISH} "${SOFT_NAME} jest już zainstalowany. $\n$\nKliknij `OK` aby odinstalować poprzednią wersję lub `Anuluj` aby przerwać aktualizację."
LangString wrongArch ${LANG_POLISH} "To oprogramowanie jest przeznaczone wyłącznie dla komputerów 64 bitowych." LangString wrongArch ${LANG_POLISH} "To oprogramowanie jest przeznaczone wyłącznie dla komputerów 64 bitowych."
LangString Elements ${LANG_POLISH} "Elementy" LangString Elements ${LANG_POLISH} "Elementy"

View File

@@ -62,10 +62,15 @@ message("PROJECT_SOURCE_DIR :" ${PROJECT_SOURCE_DIR})
message("QET_DIR :" ${QET_DIR}) message("QET_DIR :" ${QET_DIR})
message("GIT_COMMIT_SHA :" ${GIT_COMMIT_SHA}) message("GIT_COMMIT_SHA :" ${GIT_COMMIT_SHA})
if(BUILD_WITH_KF5) if(BUILD_WITH_KF6 AND BUILD_KF6)
message("KF5_GIT_TAG :" ${KF5_GIT_TAG}) message("KF6_GIT_TAG :" ${KF6_GIT_TAG})
else() endif()
add_definitions(-DBUILD_WITHOUT_KF5) if(NOT BUILD_WITH_KF6)
add_definitions(-DBUILD_WITHOUT_KF6)
endif() endif()
message("QET_COMPONENTS :" ${QET_COMPONENTS}) message("QET_COMPONENTS :" ${QET_COMPONENTS})
message("QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR}) message("Qt version :" ${Qt6_VERSION})
if(QMFILES_AS_RESOURCE)
add_definitions(-DQMFILES_AS_RESOURCE)
endif()

View File

@@ -31,5 +31,8 @@ add_definitions(-DQT_MESSAGELOGCONTEXT)
# In order to do so, uncomment the following line. # In order to do so, uncomment the following line.
#add_definitions(-DTODO_LIST) #add_definitions(-DTODO_LIST)
# Build with KF5 # Build with KF6
option(BUILD_WITH_KF5 "Build with KF5" ON) option(BUILD_WITH_KF6 "Build with KF6" ON)
# Use translations as a Qt resource
option(QMFILES_AS_RESOURCE "Use .qm files as Qt resource" ON)

View File

@@ -14,54 +14,47 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. # along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
message(" - fetch_kdeaddons") message(STATUS "fetch_kdeaddons")
if(DEFINED BUILD_WITH_KF5) if(BUILD_WITH_KF6)
option(BUILD_KF6 "Build KF6 libraries, use system ones otherwise" OFF)
block(PROPAGATE KF6_GIT_TAG)
set(BUILD_TESTING OFF)
set(KDE_SKIP_TEST_SETTINGS ON)
set(BUILD_DESIGNERPLUGIN OFF)
set(KCOREADDONS_USE_QML OFF)
set(BUILD_QCH OFF)
set(BUILD_SHARED_LIBS OFF)
find_package(ECM 6.8.0 REQUIRED NO_MODULE)
list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
if(BUILD_KF6)
Include(FetchContent) Include(FetchContent)
option(BUILD_KF5 "Build KF5 libraries, use system ones otherwise" YES) if(NOT DEFINED KF6_GIT_TAG)
set(KF6_GIT_TAG v6.8.0)
if(BUILD_KF5)
if(NOT DEFINED KF5_GIT_TAG)
#https://qelectrotech.org/forum/viewtopic.php?pid=13924#p13924
set(KF5_GIT_TAG v5.77.0)
endif() endif()
# Fix stop the run autotests of kcoreaddons
# see
# https://invent.kde.org/frameworks/kcoreaddons/-/blob/master/CMakeLists.txt#L98
# issue:
# CMake Error at /usr/share/ECM/modules/ECMAddTests.cmake:89 (add_executable):
# Cannot find source file:
# see
# https://qelectrotech.org/forum/viewtopic.php?pid=13929#p13929
set(KDE_SKIP_TEST_SETTINGS "TRUE")
set(BUILD_TESTING "0")
FetchContent_Declare(
ecm
GIT_REPOSITORY https://invent.kde.org/frameworks/extra-cmake-modules.git
GIT_TAG ${KF5_GIT_TAG})
FetchContent_MakeAvailable(ecm)
FetchContent_Declare( FetchContent_Declare(
kcoreaddons kcoreaddons
GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git
GIT_TAG ${KF5_GIT_TAG}) GIT_TAG ${KF6_GIT_TAG})
FetchContent_MakeAvailable(kcoreaddons) FetchContent_MakeAvailable(kcoreaddons)
get_target_property(kca_version KF6::CoreAddons VERSION)
FetchContent_Declare(
kwidgetsaddons
GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git
GIT_TAG ${KF5_GIT_TAG})
FetchContent_MakeAvailable(kwidgetsaddons)
else() else()
find_package(KF5CoreAddons REQUIRED) find_package(KF6CoreAddons REQUIRED)
find_package(KF5WidgetsAddons REQUIRED) set(kca_version ${KF6CoreAddons_VERSION})
endif() endif()
set(KF5_PRIVATE_LIBRARIES get_target_property(kwa_type KF6::CoreAddons TYPE)
KF5::WidgetsAddons
KF5::CoreAddons message(NOTICE "ecm version : " ${ECM_VERSION})
message(NOTICE "kcoreaddons library : " ${kca_type})
message(NOTICE "kcoreaddons version : " ${kca_version})
endblock()
set(KF6_PRIVATE_LIBRARIES
KF6::CoreAddons
) )
endif() endif()

View File

@@ -25,7 +25,7 @@ if(BUILD_PUGIXML)
FetchContent_Declare( FetchContent_Declare(
pugixml pugixml
GIT_REPOSITORY https://github.com/zeux/pugixml.git GIT_REPOSITORY https://github.com/zeux/pugixml.git
GIT_TAG v1.11.4) GIT_TAG v1.15)
FetchContent_MakeAvailable(pugixml) FetchContent_MakeAvailable(pugixml)
else() else()

View File

@@ -17,6 +17,8 @@
message(" - qet_compilation_vars") message(" - qet_compilation_vars")
set(QET_COMPONENTS set(QET_COMPONENTS
Core
Gui
LinguistTools LinguistTools
PrintSupport PrintSupport
Xml Xml
@@ -109,6 +111,12 @@ set(QET_SRC_FILES
${QET_DIR}/sources/borderproperties.h ${QET_DIR}/sources/borderproperties.h
${QET_DIR}/sources/bordertitleblock.cpp ${QET_DIR}/sources/bordertitleblock.cpp
${QET_DIR}/sources/bordertitleblock.h ${QET_DIR}/sources/bordertitleblock.h
# ${QET_DIR}/sources/colorbutton.cpp
# ${QET_DIR}/sources/colorbutton.h
# ${QET_DIR}/sources/colorcombobox.cpp
# ${QET_DIR}/sources/colorcombobox.h
# ${QET_DIR}/sources/colorcomboboxdelegate.cpp
# ${QET_DIR}/sources/colorcomboboxdelegate.h
${QET_DIR}/sources/conductorautonumerotation.cpp ${QET_DIR}/sources/conductorautonumerotation.cpp
${QET_DIR}/sources/conductorautonumerotation.h ${QET_DIR}/sources/conductorautonumerotation.h
${QET_DIR}/sources/conductornumexport.cpp ${QET_DIR}/sources/conductornumexport.cpp
@@ -495,6 +503,9 @@ set(QET_SRC_FILES
${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.cpp ${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.cpp
${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.h ${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.h
${QET_DIR}/sources/svg/qetsvg.cpp
${QET_DIR}/sources/svg/qetsvg.h
${QET_DIR}/sources/titleblock/dimension.cpp ${QET_DIR}/sources/titleblock/dimension.cpp
${QET_DIR}/sources/titleblock/dimension.h ${QET_DIR}/sources/titleblock/dimension.h
${QET_DIR}/sources/titleblock/dimensionwidget.cpp ${QET_DIR}/sources/titleblock/dimensionwidget.cpp
@@ -706,6 +717,8 @@ set(QET_SRC_FILES
${QET_DIR}/sources/xml/terminalstripitemxml.cpp ${QET_DIR}/sources/xml/terminalstripitemxml.cpp
${QET_DIR}/sources/xml/terminalstripitemxml.h ${QET_DIR}/sources/xml/terminalstripitemxml.h
${QET_DIR}/sources/xml/terminalstriplayoutpatternxml.cpp
${QET_DIR}/sources/xml/terminalstriplayoutpatternxml.h
) )
set(TS_FILES set(TS_FILES
@@ -732,13 +745,11 @@ set(TS_FILES
${QET_DIR}/lang/qet_pt.ts ${QET_DIR}/lang/qet_pt.ts
${QET_DIR}/lang/qet_pt_BR.ts ${QET_DIR}/lang/qet_pt_BR.ts
${QET_DIR}/lang/qet_ro.ts ${QET_DIR}/lang/qet_ro.ts
${QET_DIR}/lang/qet_rs.ts
${QET_DIR}/lang/qet_ru.ts ${QET_DIR}/lang/qet_ru.ts
${QET_DIR}/lang/qet_sk.ts ${QET_DIR}/lang/qet_sk.ts
${QET_DIR}/lang/qet_sl.ts ${QET_DIR}/lang/qet_sl.ts
${QET_DIR}/lang/qet_sr.ts ${QET_DIR}/lang/qet_sr.ts
${QET_DIR}/lang/qet_sv.ts ${QET_DIR}/lang/qet_sv.ts
${QET_DIR}/lang/qet_tr.ts ${QET_DIR}/lang/qet_tr.ts
${QET_DIR}/lang/qet_uk.ts
${QET_DIR}/lang/qet_zh.ts ${QET_DIR}/lang/qet_zh.ts
) )

View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:7b7798233e8251baac7717d4b0f991ad5fdf23a76d9fbe864d363e3b93458560 oid sha256:7081c74e1f0de4f21f22c596bd70dcf580f97436686b799ee64bfa2df06cbf2c
size 529821696 size 529809408

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@@ -46,7 +46,7 @@
<message> <message>
<location filename="../sources/ui/aboutqetdialog.ui" line="508"/> <location filename="../sources/ui/aboutqetdialog.ui" line="508"/>
<source>Licenses</source> <source>Licenses</source>
<translation>Povolení</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/ui/aboutqetdialog.ui" line="532"/> <location filename="../sources/ui/aboutqetdialog.ui" line="532"/>
@@ -1193,7 +1193,7 @@ Poznámka: tyto volby automatické číslování ani NEPOVOLÍ ani nezakáží,
<location filename="../sources/qetgraphicsitem/diagramtextitem.cpp" line="489"/> <location filename="../sources/qetgraphicsitem/diagramtextitem.cpp" line="489"/>
<source> <source>
&lt;Shift&gt; to move</source> &lt;Shift&gt; to move</source>
<translation>&lt;Shift&gt; k přesunutí</translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@@ -3544,29 +3544,29 @@ Stanovte výchozí hodnotu textového pole pro nové prvky níže:</translation>
<message> <message>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="874"/> <location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="874"/>
<source>Affichage Grille</source> <source>Affichage Grille</source>
<translation>Zobrazit mřížku</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="893"/> <location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="893"/>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="969"/> <location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="969"/>
<source>max:</source> <source>max:</source>
<translation>max:</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="900"/> <location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="900"/>
<source>Taille des points de la grille de Diagram-Editor : 1 - 5</source> <source>Taille des points de la grille de Diagram-Editor : 1 - 5</source>
<translation>Velikost bodu v editoru diagramů: 15</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="923"/> <location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="923"/>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="992"/> <location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="992"/>
<source>min:</source> <source>min:</source>
<translation>min:</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="946"/> <location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="946"/>
<source>Taille des points de la grille de l&apos;éditeur d&apos;éléments : 1 - 5</source> <source>Taille des points de la grille de l&apos;éditeur d&apos;éléments : 1 - 5</source>
<translation>Velikost bodu v editoru prvků: 15</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="1016"/> <location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="1016"/>
@@ -3757,7 +3757,7 @@ Stanovte výchozí hodnotu textového pole pro nové prvky níže:</translation>
<message> <message>
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="383"/> <location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="383"/>
<source>Suédois</source> <source>Suédois</source>
<translation>Švédština</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="465"/> <location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="465"/>
@@ -5821,7 +5821,7 @@ Dostupné volby:
<location filename="../sources/qetapp.cpp" line="2593"/> <location filename="../sources/qetapp.cpp" line="2593"/>
<source> --data-dir=DIR Definir le dossier de data <source> --data-dir=DIR Definir le dossier de data
</source> </source>
<translation> --data-dir=DIR Stanovit adresář s daty</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetapp.cpp" line="2595"/> <location filename="../sources/qetapp.cpp" line="2595"/>
@@ -6944,20 +6944,17 @@ Dostupné volby:
<message> <message>
<location filename="../sources/editor/ui/qetelementeditor.ui" line="505"/> <location filename="../sources/editor/ui/qetelementeditor.ui" line="505"/>
<source>Fine-Rotation</source> <source>Fine-Rotation</source>
<translatorcomment>Jemné otáčení</translatorcomment> <translation type="unfinished"></translation>
<translation></translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/ui/qetelementeditor.ui" line="514"/> <location filename="../sources/editor/ui/qetelementeditor.ui" line="514"/>
<source>Mirror</source> <source>Mirror</source>
<translatorcomment>Zrcadlit</translatorcomment> <translation type="unfinished"></translation>
<translation></translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/ui/qetelementeditor.ui" line="523"/> <location filename="../sources/editor/ui/qetelementeditor.ui" line="523"/>
<source>Flip</source> <source>Flip</source>
<translatorcomment>Převrátit</translatorcomment> <translation type="unfinished"></translation>
<translation></translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/ui/qetelementeditor.ui" line="532"/> <location filename="../sources/editor/ui/qetelementeditor.ui" line="532"/>
@@ -8110,13 +8107,13 @@ Co si přejete udělat?</translation>
<location filename="../sources/editor/editorcommands.cpp" line="676"/> <location filename="../sources/editor/editorcommands.cpp" line="676"/>
<source>Miroir de sélection</source> <source>Miroir de sélection</source>
<comment>undo caption</comment> <comment>undo caption</comment>
<translation>Zrcadlit výběr</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/editorcommands.cpp" line="724"/> <location filename="../sources/editor/editorcommands.cpp" line="724"/>
<source>Retourner la sélection</source> <source>Retourner la sélection</source>
<comment>undo caption</comment> <comment>undo caption</comment>
<translation>Převrátit výběr</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/graphicspart/partarc.h" line="52"/> <location filename="../sources/editor/graphicspart/partarc.h" line="52"/>
@@ -8929,182 +8926,182 @@ Chcete je nahradit?</translation>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="272"/> <location filename="../sources/qetinformation.cpp" line="272"/>
<source>Bloc auxiliaire 1</source> <source>Bloc auxiliaire 1</source>
<translation>Dodatečné informace o přídavném zařízení 1</translation> <translation>Pomocný blok 1</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="273"/> <location filename="../sources/qetinformation.cpp" line="273"/>
<source>Description textuelle auxiliaire 1</source> <source>Description textuelle auxiliaire 1</source>
<translation>Textový popis přídavného zařízení 1</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="274"/> <location filename="../sources/qetinformation.cpp" line="274"/>
<source>Numéro d&apos;article auxiliaire 1</source> <source>Numéro d&apos;article auxiliaire 1</source>
<translation>Číslo přídavného zařízení 1</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="275"/> <location filename="../sources/qetinformation.cpp" line="275"/>
<source>Fabricant auxiliaire 1</source> <source>Fabricant auxiliaire 1</source>
<translation>Výrobce přídavného zařízení 1</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="276"/> <location filename="../sources/qetinformation.cpp" line="276"/>
<source>Numéro de commande auxiliaire 1</source> <source>Numéro de commande auxiliaire 1</source>
<translation>Objednací číslo přídavného zařízení 1</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="277"/> <location filename="../sources/qetinformation.cpp" line="277"/>
<source>Numéro interne auxiliaire 1</source> <source>Numéro interne auxiliaire 1</source>
<translation>Vnitřní číslo přídavného zařízení 1</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="278"/> <location filename="../sources/qetinformation.cpp" line="278"/>
<source>Fournisseur auxiliaire 1</source> <source>Fournisseur auxiliaire 1</source>
<translation>Dodavatel přídavného zařízení 1</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="279"/> <location filename="../sources/qetinformation.cpp" line="279"/>
<source>Quantité auxiliaire 1</source> <source>Quantité auxiliaire 1</source>
<translation>Množství přídavného zařízení 1</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="280"/> <location filename="../sources/qetinformation.cpp" line="280"/>
<source>Unité auxiliaire 1</source> <source>Unité auxiliaire 1</source>
<translation>Jednotka přídavného zařízení 1</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="281"/> <location filename="../sources/qetinformation.cpp" line="281"/>
<source>Bloc auxiliaire 2</source> <source>Bloc auxiliaire 2</source>
<translation>Dodatečné informace o přídavném zařízení 2</translation> <translation>Pomocný blok 2</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="282"/> <location filename="../sources/qetinformation.cpp" line="282"/>
<source>Description textuelle auxiliaire 2</source> <source>Description textuelle auxiliaire 2</source>
<translation>Textový popis přídavného zařízení 2</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="283"/> <location filename="../sources/qetinformation.cpp" line="283"/>
<source>Numéro d&apos;article auxiliaire 2</source> <source>Numéro d&apos;article auxiliaire 2</source>
<translation>Číslo přídavného zařízení 2</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="284"/> <location filename="../sources/qetinformation.cpp" line="284"/>
<source>Fabricant auxiliaire 2</source> <source>Fabricant auxiliaire 2</source>
<translation>Výrobce přídavného zařízení 2</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="285"/> <location filename="../sources/qetinformation.cpp" line="285"/>
<source>Numéro de commande auxiliaire 2</source> <source>Numéro de commande auxiliaire 2</source>
<translation>Objednací číslo přídavného zařízení 2</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="286"/> <location filename="../sources/qetinformation.cpp" line="286"/>
<source>Numéro interne auxiliaire 2</source> <source>Numéro interne auxiliaire 2</source>
<translation>Vnitřní číslo přídavného zařízení 2</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="287"/> <location filename="../sources/qetinformation.cpp" line="287"/>
<source>Fournisseur auxiliaire 2</source> <source>Fournisseur auxiliaire 2</source>
<translation>Dodavatel přídavného zařízení 2</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="288"/> <location filename="../sources/qetinformation.cpp" line="288"/>
<source>Quantité auxiliaire 2</source> <source>Quantité auxiliaire 2</source>
<translation>Množství přídavného zařízení 2</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="289"/> <location filename="../sources/qetinformation.cpp" line="289"/>
<source>Unité auxiliaire 2</source> <source>Unité auxiliaire 2</source>
<translation>Jednotka přídavného zařízení 2</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="290"/> <location filename="../sources/qetinformation.cpp" line="290"/>
<source>Bloc auxiliaire 3</source> <source>Bloc auxiliaire 3</source>
<translation>Dodatečné informace o přídavném zařízení 3</translation> <translation type="unfinished">Pomocný blok 3</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="291"/> <location filename="../sources/qetinformation.cpp" line="291"/>
<source>Description textuelle auxiliaire 3</source> <source>Description textuelle auxiliaire 3</source>
<translation>Textový popis přídavného zařízení 3</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="292"/> <location filename="../sources/qetinformation.cpp" line="292"/>
<source>Numéro d&apos;article auxiliaire 3</source> <source>Numéro d&apos;article auxiliaire 3</source>
<translation>Číslo přídavného zařízení 3</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="293"/> <location filename="../sources/qetinformation.cpp" line="293"/>
<source>Fabricant auxiliaire 3</source> <source>Fabricant auxiliaire 3</source>
<translation>Výrobce přídavného zařízení 3</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="294"/> <location filename="../sources/qetinformation.cpp" line="294"/>
<source>Numéro de commande auxiliaire 3</source> <source>Numéro de commande auxiliaire 3</source>
<translation>Objednací číslo přídavného zařízení 3</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="295"/> <location filename="../sources/qetinformation.cpp" line="295"/>
<source>Numéro interne auxiliaire 3</source> <source>Numéro interne auxiliaire 3</source>
<translation>Vnitřní číslo přídavného zařízení 3</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="296"/> <location filename="../sources/qetinformation.cpp" line="296"/>
<source>Fournisseur auxiliaire 3</source> <source>Fournisseur auxiliaire 3</source>
<translation>Dodavatel přídavného zařízení 3</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="297"/> <location filename="../sources/qetinformation.cpp" line="297"/>
<source>Quantité auxiliaire 3</source> <source>Quantité auxiliaire 3</source>
<translation>Množství přídavného zařízení 3</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="298"/> <location filename="../sources/qetinformation.cpp" line="298"/>
<source>Unité auxiliaire 3</source> <source>Unité auxiliaire 3</source>
<translation>Jednotka přídavného zařízení 3</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="299"/> <location filename="../sources/qetinformation.cpp" line="299"/>
<source>Bloc auxiliaire 4</source> <source>Bloc auxiliaire 4</source>
<translation>Dodatečné informace o přídavném zařízení 4</translation> <translation type="unfinished">Pomocný blok 4</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="300"/> <location filename="../sources/qetinformation.cpp" line="300"/>
<source>Description textuelle auxiliaire 4</source> <source>Description textuelle auxiliaire 4</source>
<translation>Textový popis přídavného zařízení 4</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="301"/> <location filename="../sources/qetinformation.cpp" line="301"/>
<source>Numéro d&apos;article auxiliaire 4</source> <source>Numéro d&apos;article auxiliaire 4</source>
<translation>Číslo přídavného zařízení 4</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="302"/> <location filename="../sources/qetinformation.cpp" line="302"/>
<source>Fabricant auxiliaire 4</source> <source>Fabricant auxiliaire 4</source>
<translation>Výrobce přídavného zařízení 4</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="303"/> <location filename="../sources/qetinformation.cpp" line="303"/>
<source>Numéro de commande auxiliaire 4</source> <source>Numéro de commande auxiliaire 4</source>
<translation>Objednací číslo přídavného zařízení 4</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="304"/> <location filename="../sources/qetinformation.cpp" line="304"/>
<source>Numéro interne auxiliaire 4</source> <source>Numéro interne auxiliaire 4</source>
<translation>Vnitřní číslo přídavného zařízení 4</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="305"/> <location filename="../sources/qetinformation.cpp" line="305"/>
<source>Fournisseur auxiliaire 4</source> <source>Fournisseur auxiliaire 4</source>
<translation>Dodavatel přídavného zařízení 4</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="306"/> <location filename="../sources/qetinformation.cpp" line="306"/>
<source>Quantité auxiliaire 4</source> <source>Quantité auxiliaire 4</source>
<translation>Množství přídavného zařízení 4</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="307"/> <location filename="../sources/qetinformation.cpp" line="307"/>
<source>Unité auxiliaire 4</source> <source>Unité auxiliaire 4</source>
<translation>Jednotka přídavného zařízení 4</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="257"/> <location filename="../sources/qetinformation.cpp" line="257"/>
@@ -9494,8 +9491,7 @@ Chcete je nahradit?</translation>
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="100"/> <location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="100"/>
<source>QET_ElementScaler: <source>QET_ElementScaler:
additional information about %1 import / scaling</source> additional information about %1 import / scaling</source>
<translation>QET_ElementScaler: <translation type="unfinished"></translation>
další informace týkající se zavedení/škálování %1</translation>
</message> </message>
<message> <message>
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="149"/> <location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="149"/>
@@ -9508,8 +9504,7 @@ Stáhněte jej z níže uvedeného odkazu a rozbalte jej do instalační složky
<location filename="../sources/dxf/dxftoelmt.cpp" line="58"/> <location filename="../sources/dxf/dxftoelmt.cpp" line="58"/>
<source>Dxf2elmt: <source>Dxf2elmt:
Error: Make sure the file %1 is a valid .dxf file</source> Error: Make sure the file %1 is a valid .dxf file</source>
<translation>Dxf2elmt: <translation type="unfinished"></translation>
Chyba: Ujistěte se, že soubor %1 je platný soubor .dxf</translation>
</message> </message>
<message> <message>
<location filename="../sources/dxf/dxftoelmt.cpp" line="59"/> <location filename="../sources/dxf/dxftoelmt.cpp" line="59"/>

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -1,76 +0,0 @@
.TH QELECTROTECH 1 "AOÛT 2008" QElectroTech "사용자 설명서"
.SH 이름
qelectrotech \- 전기 도면 편집기
.SH 사용법
.B qelectrotech
.B [\-\-common\-elements\-dir\fR=\fI경로\fB]
.B [\-\-config\-dir\fR=\fI경로\fB]
.B [\-\-lang\-dir\fR=\fI경로\fB]
.B [\-\-help]
.B [\-v\fR|\fB\-\-version]
.B [\-\-license]
.B [\fI파일\fB]...
.SH 설명
QElectroTech는 전기 도면 편집기입니다. 도면(*.qet)과 전기 요소(*.elmt)는 XML 형식으로 저장됩니다.
도면에서 사용할 수 있는 요소는 공용 컬렉션 또는 사용자 컬렉션에서 가져올 수 있습니다.
일반적으로 공용 컬렉션은 모든 사용자가 접근할 수 있지만 사용자가 편집할 수는 없습니다.
사용자 컬렉션은 각 사용자에게 고유하며 사용자가 원하는 대로 수정할 수 있습니다.
.SH 옵션
.TP
\fB\-\-common\-elements\-dir\fR=\fI경로\fR
공용 요소(Elements) 컬렉션의 루트로 \fI경로\fR 폴더를 사용합니다.
참고: 이 옵션은 컴파일 시 QET_ALLOW_OVERRIDE_CED_OPTION 지시문이 지정된 경우에만 활성화됩니다.
.TP
\fB\-\-config\-dir\fR=\fI경로\fR
현재 사용자의 설정 폴더로 \fI경로\fR 폴더를 사용합니다.
이 폴더에는 애플리케이션 설정을 담은 qelectrotech.conf 파일과, 사용자 요소 컬렉션을 담는 elements 하위 폴더가 포함됩니다.
참고: 이 옵션은 컴파일 시 QET_ALLOW_OVERRIDE_CD_OPTION 지시문이 지정된 경우에만 활성화됩니다.
.TP
\fB\-\-lang\-dir\fR=\fI경로\fR
애플리케이션 번역 파일을 \fI경로\fR 폴더에서 찾습니다.
.TP
\fB\-\-help\fR
사용 가능한 옵션에 대한 간단한 설명을 표시합니다.
.TP
\fB\-v\fR, \fB\-\-version\fR
애플리케이션 버전을 표시합니다(예: 0.1).
.TP
\fB\-\-license\fR
애플리케이션 라이선스(GNU/GPL)를 표시합니다.
.P
참고: 위 옵션 중 마지막 3개(\-\-lang\-dir, \-\-help, \-\-version, \-\-license 관련)는 명령행에서 지정되면
해당 정보를 표시한 뒤 프로그램이 종료됩니다.
사용자가 이미 애플리케이션을 실행 중인 경우에는, 실행 중인 인스턴스가 명령행을 처리하며 특히 열 파일 목록에 적용됩니다.
다만 폴더를 재정의하는 옵션(공용 컬렉션/설정 폴더/언어 파일 폴더)은 적용되지 않습니다.
열 파일의 확장자가 .elmt로 끝나면 QElectroTech는 요소 편집기로 열려고 시도합니다.
그 외에는 도면 파일로 간주합니다.
.SH 작성자
Benoît Ansieau <benoit@qelectrotech.org>
.br
Xavier Guerrin <xavier@qelectrotech.org>
.br
Laurent Trinques <scorpio@qelectrotech.org>
.br
Joshua Claveau <joshua@qelectrotech.org>
.br
Cyril.frausti <cyril@qelectrotech.org>
.br
.SH 버그 신고
애플리케이션에서 비정상 동작이 의심되면, FAQ <http://qelectrotech.org/wiki/doku.php?id=doc:faq> 와
BugTracker <http://qelectrotech.org/bugtracker/> 를 확인하여 이미 알려진 문제인지 확인해 주세요.
해당 문제가 없다면 BugTracker를 통해 버그 리포트를 제출해 주세요.
.SH 저작권
Copyright © QElectroTech 개발자
.br
라이선스: GNU/GPL v2+ : <http://www.gnu.org/licenses/old\-licenses/gpl\-2.0.html>
.br
이 프로그램은 자유 소프트웨어입니다. 수정 및 재배포할 수 있습니다. 이 프로그램은 “있는 그대로(as is)” 제공되며 어떠한 보증도 없습니다.
.SH 참고
공식 사이트: <http://qelectrotech.org/>

View File

@@ -22,7 +22,6 @@ Comment[fr]=Éditer des schémas électriques.
Comment[hr]=Uredi elektro sheme Comment[hr]=Uredi elektro sheme
Comment[it]=Disegnare schemi elettrici Comment[it]=Disegnare schemi elettrici
Comment[ja]=電気回路図の編集。 Comment[ja]=電気回路図の編集。
Comment[ko]=전기 도면을 편집합니다.
Comment[nl]=Bewerken bedradingsdiagrammen. Comment[nl]=Bewerken bedradingsdiagrammen.
Comment[pl]=Edycja schematów elektrycznych Comment[pl]=Edycja schematów elektrycznych
Comment[pt]=Criar esquemas eléctricos. Comment[pt]=Criar esquemas eléctricos.
@@ -41,7 +40,6 @@ GenericName[fr]=Éditeur de schémas électriques
GenericName[hr]=Editor elektro sheme GenericName[hr]=Editor elektro sheme
GenericName[it]=Programma per disegnare schemi elettrici GenericName[it]=Programma per disegnare schemi elettrici
GenericName[ja]=電気回路図エディタ GenericName[ja]=電気回路図エディタ
GenericName[ko]=전기 도면 편집기
GenericName[nl]=Elektrische schema editor GenericName[nl]=Elektrische schema editor
GenericName[pl]=Edytor schematów elektrycznych GenericName[pl]=Edytor schematów elektrycznych
GenericName[pt]=Editor de esquemas eléctricos. GenericName[pt]=Editor de esquemas eléctricos.

View File

@@ -13,12 +13,11 @@
<summary xml:lang="da">Elektrisk diagram redigering</summary> <summary xml:lang="da">Elektrisk diagram redigering</summary>
<summary xml:lang="de">Zeichenprogramm für Schaltpläne</summary> <summary xml:lang="de">Zeichenprogramm für Schaltpläne</summary>
<summary xml:lang="el">Επεξεργαστής ηλεκτρικών διαγραμμάτων</summary> <summary xml:lang="el">Επεξεργαστής ηλεκτρικών διαγραμμάτων</summary>
<summary xml:lang="es">Editor de esquemas eléctricos</summary> <summary xml:lang="ex">Editor de esquemas eléctricos</summary>
<summary xml:lang="fr">Éditeur de schémas électriques</summary> <summary xml:lang="fr">Éditeur de schémas électriques</summary>
<summary xml:lang="hr">Editor elektro sheme</summary> <summary xml:lang="hr">Editor elektro sheme</summary>
<summary xml:lang="it">Programma per disegnare schemi elettrici</summary> <summary xml:lang="it">Programma per disegnare schemi elettrici</summary>
<summary xml:lang="ja">電気回路図エディタ</summary> <summary xml:lang="ja">電気回路図エディタ</summary>
<summary xml:lang="ko">전기 도면 편집기</summary>
<summary xml:lang="nl">Elektrische schema bewerker</summary> <summary xml:lang="nl">Elektrische schema bewerker</summary>
<summary xml:lang="pl">Edytor schematów elektrycznych</summary> <summary xml:lang="pl">Edytor schematów elektrycznych</summary>
<summary xml:lang="pt">Editor de esquemas eléctricos</summary> <summary xml:lang="pt">Editor de esquemas eléctricos</summary>
@@ -72,10 +71,6 @@
QElectroTech は電気回路図を作成する Qt5 アプリケーションです。 QElectroTech は電気回路図を作成する Qt5 アプリケーションです。
QET は要素と回路図に XML 形式を利用し、回路図エディタ、要素エディタ、表題欄エディタを含みます。 QET は要素と回路図に XML 形式を利用し、回路図エディタ、要素エディタ、表題欄エディタを含みます。
</p> </p>
<p xml:lang="ko">
QElectroTech는 전기 도면을 설계하기 위한 Qt5 기반 애플리케이션입니다.
요소와 도면을 XML 형식으로 관리하며, 도면 편집기, 요소 편집기, 표제란 편집기를 포함하고 있습니다.
</p>
<p xml:lang="nl"> <p xml:lang="nl">
QElectroTech is een Qt5 applicatie om elektrische schema's te ontwerpen. QElectroTech is een Qt5 applicatie om elektrische schema's te ontwerpen.
Het maakt gebruik van XML-bestanden voor elementen en diagrammen, en omvat zowel een diagram bewerker, een element bewerker, en een bloksjabloon bewerker. Het maakt gebruik van XML-bestanden voor elementen en diagrammen, en omvat zowel een diagram bewerker, een element bewerker, en een bloksjabloon bewerker.

View File

@@ -14,7 +14,6 @@
<comment xml:lang="fr">Fichier projet QElectroTech</comment> <comment xml:lang="fr">Fichier projet QElectroTech</comment>
<comment xml:lang="it">File del progetto QElectroTech</comment> <comment xml:lang="it">File del progetto QElectroTech</comment>
<comment xml:lang="ja">QElectroTech プロジェクト・ファイル</comment> <comment xml:lang="ja">QElectroTech プロジェクト・ファイル</comment>
<comment xml:lang="ko">QElectroTech 프로젝트 파일</comment>
<comment xml:lang="nl">QElectroTech project bestand</comment> <comment xml:lang="nl">QElectroTech project bestand</comment>
<comment xml:lang="pl">Plik projektu QElectrotech</comment> <comment xml:lang="pl">Plik projektu QElectrotech</comment>
<comment xml:lang="pt">Ficheiro de projecto QElectroTech</comment> <comment xml:lang="pt">Ficheiro de projecto QElectroTech</comment>
@@ -35,7 +34,6 @@
<comment xml:lang="fr">Fichier élément QElectroTech</comment> <comment xml:lang="fr">Fichier élément QElectroTech</comment>
<comment xml:lang="it">File del progetto QElectroTech</comment> <comment xml:lang="it">File del progetto QElectroTech</comment>
<comment xml:lang="ja">QElectroTech 要素ファイル</comment> <comment xml:lang="ja">QElectroTech 要素ファイル</comment>
<comment xml:lang="ko">QElectroTech 요소 파일</comment>
<comment xml:lang="nl">QElectroTech element bestand</comment> <comment xml:lang="nl">QElectroTech element bestand</comment>
<comment xml:lang="pl">Plik elementu QElectroTech</comment> <comment xml:lang="pl">Plik elementu QElectroTech</comment>
<comment xml:lang="pt">Ficheiro de projecto QElectroTech</comment> <comment xml:lang="pt">Ficheiro de projecto QElectroTech</comment>
@@ -56,7 +54,6 @@
<comment xml:lang="fr">Modèle de cartouche QElectroTech</comment> <comment xml:lang="fr">Modèle de cartouche QElectroTech</comment>
<comment xml:lang="it">Modello di cartiglio per QElectroTech</comment> <comment xml:lang="it">Modello di cartiglio per QElectroTech</comment>
<comment xml:lang="ja">QElectroTech 表題欄テンプレート</comment> <comment xml:lang="ja">QElectroTech 表題欄テンプレート</comment>
<comment xml:lang="ko">QElectroTech 표제란 템플릿 파일</comment>
<comment xml:lang="nl">QElectroTech titel bloksjabloon</comment> <comment xml:lang="nl">QElectroTech titel bloksjabloon</comment>
<comment xml:lang="pl">Szablon tabliczki rysunkowej QElectroTech</comment> <comment xml:lang="pl">Szablon tabliczki rysunkowej QElectroTech</comment>
<comment xml:lang="pt">Modelo de moldura QElectroTech</comment> <comment xml:lang="pt">Modelo de moldura QElectroTech</comment>

View File

@@ -26,12 +26,7 @@
#include "xmlprojectelementcollectionitem.h" #include "xmlprojectelementcollectionitem.h"
#include <QFutureWatcher> #include <QFutureWatcher>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
#include <QtConcurrentMap> #include <QtConcurrentMap>
#else
#include <QtConcurrentRun>
#endif
/** /**
@brief ElementsCollectionModel::ElementsCollectionModel @brief ElementsCollectionModel::ElementsCollectionModel
Constructor Constructor
@@ -298,15 +293,8 @@ void ElementsCollectionModel::loadCollections(bool common_collection,
&QFutureWatcher<void>::finished, &QFutureWatcher<void>::finished,
watcher, watcher,
&QFutureWatcher<void>::deleteLater); &QFutureWatcher<void>::deleteLater);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
m_future = QtConcurrent::map(m_items_list_to_setUp, setUpData); m_future = QtConcurrent::map(m_items_list_to_setUp, setUpData);
#else
# if TODO_LIST
# pragma message("@TODO remove code for QT 6 or later")
# endif
qDebug() << "Help code for QT 6 or later"
<< "QtConcurrent::run its backwards now...function, object, args";
#endif
watcher->setFuture(m_future); watcher->setFuture(m_future);
} }

View File

@@ -807,13 +807,13 @@ bool ElementsLocation::setXml(const QDomDocument &xml_document) const
QString path_ = collectionPath(false); QString path_ = collectionPath(false);
QRegularExpression rx("^(.*)/(.*\\.elmt)$"); QRegularExpression rx("^(.*)/(.*\\.elmt)$");
if (rx.exactMatch(path_)) if (auto regex_match = rx.match(path_); regex_match.hasMatch())
{ {
return project() return project()
->embeddedElementCollection() ->embeddedElementCollection()
->addElementDefinition( ->addElementDefinition(
rx.cap(1), regex_match.captured(1),
rx.cap(2), regex_match.captured(2),
xml_document.documentElement()); xml_document.documentElement());
} }
else else

View File

@@ -58,10 +58,6 @@ XmlElementCollection::XmlElementCollection(QETProject *project) :
QChar(0x30A4), QChar(0x30F3), QChar(0x30D0), QChar(0x30FC), QChar(0x30A4), QChar(0x30F3), QChar(0x30D0), QChar(0x30FC),
QChar(0x30C8), QChar(0x3055), QChar(0x308C), QChar(0x305F), QChar(0x30C8), QChar(0x3055), QChar(0x308C), QChar(0x305F),
QChar(0x8981), QChar(0x7D20)}; QChar(0x8981), QChar(0x7D20)};
const QChar korean_data[8] = {
QChar(0xC804), QChar(0xAE30), QChar(0x0020),
QChar(0xC2EC), QChar(0xBCFC), QChar(0x0020),
QChar(0xC694), QChar(0xC18C)};
const QChar russian_data[24] = { const QChar russian_data[24] = {
QChar(0x0418), QChar(0x043C), QChar(0x043F), QChar(0x043E), QChar(0x0418), QChar(0x043C), QChar(0x043F), QChar(0x043E),
QChar(0x0440), QChar(0x0442), QChar(0x0438), QChar(0x0440), QChar(0x0440), QChar(0x0442), QChar(0x0438), QChar(0x0440),
@@ -92,8 +88,6 @@ XmlElementCollection::XmlElementCollection(QETProject *project) :
names.addName("it", "Elementi importati"); names.addName("it", "Elementi importati");
names.addName("ja", QString(japanese_data, 10)); names.addName("ja", QString(japanese_data, 10));
//names.addName("ja", "インバートされた要素"); //names.addName("ja", "インバートされた要素");
names.addName("ko", QString(korean_data, 8));
names.addName("ko_KR", QString(korean_data, 8));
names.addName("nl", "Elementen geïmporteerd"); names.addName("nl", "Elementen geïmporteerd");
names.addName("nl_BE", "Elementen geïmporteerd"); names.addName("nl_BE", "Elementen geïmporteerd");
names.addName("pl", "Elementy importowane"); names.addName("pl", "Elementy importowane");

View File

@@ -18,6 +18,7 @@
#include "terminalstripdrawer.h" #include "terminalstripdrawer.h"
#include <QPainter> #include <QPainter>
#include <QHash>
namespace TerminalStripDrawer { namespace TerminalStripDrawer {

View File

@@ -131,7 +131,7 @@ bool PhysicalTerminal::setLevelOf(const QSharedPointer<RealTerminal> &terminal,
if (i >= 0) if (i >= 0)
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5,14,0) #if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
m_real_terminal.swapItemsAt(i, std::min(level, m_real_terminal.size()-1)); m_real_terminal.swapItemsAt(i, std::min(static_cast<qsizetype>(level), m_real_terminal.size()-1));
#else #else
auto j = std::min(level, m_real_terminal.size()-1); auto j = std::min(level, m_real_terminal.size()-1);
std::swap(m_real_terminal.begin()[i], m_real_terminal.begin()[j]); std::swap(m_real_terminal.begin()[i], m_real_terminal.begin()[j]);

View File

@@ -188,11 +188,9 @@ void MachineInfo::send_info_to_debug()
QDirIterator it1(QETApp::commonElementsDir().toLatin1(),nameFilters, QDir::Files, QDirIterator::Subdirectories); QDirIterator it1(QETApp::commonElementsDir().toLatin1(),nameFilters, QDir::Files, QDirIterator::Subdirectories);
while (it1.hasNext()) while (it1.hasNext())
{ {
if(it1.next() > 0 ) it1.next();
{
commomElementsDir ++; commomElementsDir ++;
} }
}
qInfo()<< " Common Elements count:"<< commomElementsDir << "Elements"; qInfo()<< " Common Elements count:"<< commomElementsDir << "Elements";
@@ -200,22 +198,18 @@ void MachineInfo::send_info_to_debug()
QDirIterator it2(QETApp::customElementsDir().toLatin1(), nameFilters, QDir::Files, QDirIterator::Subdirectories); QDirIterator it2(QETApp::customElementsDir().toLatin1(), nameFilters, QDir::Files, QDirIterator::Subdirectories);
while (it2.hasNext()) while (it2.hasNext())
{ {
if(it2.next() > 0 ) it2.next();
{
customElementsDir ++; customElementsDir ++;
} }
}
qInfo()<< " Custom Elements count:"<< customElementsDir << "Elements"; qInfo()<< " Custom Elements count:"<< customElementsDir << "Elements";
int companyElementsDir = 0; int companyElementsDir = 0;
QDirIterator it3(QETApp::companyElementsDir().toLatin1(), nameFilters, QDir::Files, QDirIterator::Subdirectories); QDirIterator it3(QETApp::companyElementsDir().toLatin1(), nameFilters, QDir::Files, QDirIterator::Subdirectories);
while (it3.hasNext()) while (it3.hasNext())
{ {
if(it3.next() > 0 ) it3.next();
{
companyElementsDir ++; companyElementsDir ++;
} }
}
qInfo()<< " Company Elements count:"<< companyElementsDir << "Elements"; qInfo()<< " Company Elements count:"<< companyElementsDir << "Elements";
qInfo()<< ""; qInfo()<< "";

View File

@@ -198,7 +198,6 @@ namespace QET {
QIcon hu; QIcon hu;
QIcon it; QIcon it;
QIcon jp; QIcon jp;
QIcon ko;
QIcon pl; QIcon pl;
QIcon pt; QIcon pt;
QIcon ro; QIcon ro;
@@ -673,7 +672,6 @@ void QET::Icons::initIcons()
hu .addFile(":/ico/24x16/hu.png"); hu .addFile(":/ico/24x16/hu.png");
it .addFile(":/ico/24x16/it.png"); it .addFile(":/ico/24x16/it.png");
jp .addFile(":/ico/24x16/jp.png"); jp .addFile(":/ico/24x16/jp.png");
ko .addFile(":/ico/24x16/kr.png");
pl .addFile(":/ico/24x16/pl.png"); pl .addFile(":/ico/24x16/pl.png");
pt .addFile(":/ico/24x16/pt.png"); pt .addFile(":/ico/24x16/pt.png");
ro .addFile(":/ico/24x16/ro.png"); ro .addFile(":/ico/24x16/ro.png");

View File

@@ -206,7 +206,6 @@ namespace QET {
extern QIcon hu; extern QIcon hu;
extern QIcon it; extern QIcon it;
extern QIcon jp; extern QIcon jp;
extern QIcon ko;
extern QIcon pl; extern QIcon pl;
extern QIcon pt; extern QIcon pt;
extern QIcon ro; extern QIcon ro;

View File

@@ -20,6 +20,7 @@
#include <QDomElement> #include <QDomElement>
#include <QPen> #include <QPen>
#include <QUuid>
class QDomDocument; class QDomDocument;
class QDir; class QDir;

View File

@@ -70,25 +70,6 @@ void QGIManager::release(QGraphicsItem *qgi) {
} }
} }
/**
Demande au QGIManager de gerer plusieurs QGI
@param qgis QGraphicsItems a gerer
*/
void QGIManager::manage(const QList<QGraphicsItem *> &qgis) {
foreach(QGraphicsItem *qgi, qgis) manage(qgi);
}
/**
Indique au QGIManager que pour chaque QGI fourni, une reference vers celui-ci
a ete detruite.
S'il n'y a plus de references vers un QGI et que celui-ci n'est pas present
sur la scene de ce QGIManager, alors il sera detruit.
@param qgis QGraphicsItems a ne plus gerer
*/
void QGIManager::release(const QList<QGraphicsItem *> &qgis) {
foreach(QGraphicsItem *qgi, qgis) release(qgi);
}
void QGIManager::manage(const QVector<QGraphicsItem *> &items) { void QGIManager::manage(const QVector<QGraphicsItem *> &items) {
for (const auto &qgi : items) { for (const auto &qgi : items) {
manage(qgi); manage(qgi);

View File

@@ -45,10 +45,6 @@ class QGIManager {
public: public:
void manage(QGraphicsItem *); void manage(QGraphicsItem *);
void release(QGraphicsItem *); void release(QGraphicsItem *);
QT_DEPRECATED_X("Use QGIManager::manage(const QVector<QGraphicsItem *> &) instead")
void manage(const QList<QGraphicsItem *> &);
QT_DEPRECATED_X("Use QGIManager::release(const QVector<QGraphicsItem *> &) instead")
void release(const QList<QGraphicsItem *> &);
void manage(const QVector<QGraphicsItem *> &items); void manage(const QVector<QGraphicsItem *> &items);
void release(const QVector<QGraphicsItem *> &items); void release(const QVector<QGraphicsItem *> &items);
void setDestroyQGIOnDelete(bool); void setDestroyQGIOnDelete(bool);

View File

@@ -16,7 +16,6 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "recentfiles.h" #include "recentfiles.h"
#include "qeticons.h"
#include <QMenu> #include <QMenu>
/** /**
@@ -33,7 +32,7 @@ RecentFiles::RecentFiles(const QString &identifier, int size, QObject *parent) :
menu_(nullptr) menu_(nullptr)
{ {
mapper_ = new QSignalMapper(this); mapper_ = new QSignalMapper(this);
connect(mapper_, SIGNAL(mapped(const QString &)), this, SLOT(handleMenuRequest(const QString &))); connect(mapper_, &QSignalMapper::mappedString, this, &RecentFiles::fileOpeningRequested);
extractFilesFromSettings(); extractFilesFromSettings();
buildMenu(); buildMenu();
@@ -103,13 +102,6 @@ void RecentFiles::save()
saveFilesToSettings(); saveFilesToSettings();
} }
/**
Gere les actions sur le menu
*/
void RecentFiles::handleMenuRequest(const QString &filepath) {
emit(fileOpeningRequested(filepath));
}
/** /**
Gere le fait qu'un fichier ait ete ouvert Gere le fait qu'un fichier ait ete ouvert
@param filepath Chemin du fichier ouvert @param filepath Chemin du fichier ouvert
@@ -193,6 +185,6 @@ void RecentFiles::buildMenu()
// lie l'action et le mapper // lie l'action et le mapper
mapper_ -> setMapping(action, filepath); mapper_ -> setMapping(action, filepath);
connect(action, SIGNAL(triggered()), mapper_, SLOT(map())); connect(action, &QAction::triggered, mapper_, qOverload<>(&QSignalMapper::map));
} }
} }

View File

@@ -54,9 +54,6 @@ class RecentFiles : public QObject {
void saveFilesToSettings(); void saveFilesToSettings();
void buildMenu(); void buildMenu();
private slots:
void handleMenuRequest(const QString &);
// attributes // attributes
private: private:
QString identifier_; QString identifier_;

View File

@@ -454,7 +454,7 @@ QDomElement TitleBlockTemplatesFilesCollection::getTemplateXmlDescription(const
} }
QDomDocument *xml_document = new QDomDocument(); QDomDocument *xml_document = new QDomDocument();
bool xml_parsing = xml_document -> setContent(&xml_file); const auto xml_parsing = xml_document -> setContent(&xml_file);
if (!xml_parsing) { if (!xml_parsing) {
delete xml_document; delete xml_document;
return(QDomElement()); return(QDomElement());

View File

@@ -24,6 +24,8 @@ class HelperCell;
class SplittedHelperCell; class SplittedHelperCell;
class TitleBlockTemplateCommand; class TitleBlockTemplateCommand;
class TitleBlockTemplateCellsSet; class TitleBlockTemplateCellsSet;
class QGraphicsLayoutItem;
class QGraphicsGridLayout;
/** /**
This QGraphicsView subclass is used in the title block template editor to This QGraphicsView subclass is used in the title block template editor to

View File

@@ -103,7 +103,7 @@ bool TitleBlockTemplate::loadFromXmlFile(const QString &filepath) {
// parse its content as XML // parse its content as XML
QDomDocument xml_doc; QDomDocument xml_doc;
bool xml_parsing = xml_doc.setContent(&template_file); const auto xml_parsing = xml_doc.setContent(&template_file);
if (!xml_parsing) { if (!xml_parsing) {
return(false); return(false);
} }

View File

@@ -131,7 +131,6 @@ void AboutQETDialog::setTranslators()
addAuthor(ui->m_translators_label, "Yaroslav", "", tr("Traduction en ukrainien")); addAuthor(ui->m_translators_label, "Yaroslav", "", tr("Traduction en ukrainien"));
addAuthor(ui->m_translators_label, "JoelAs", "", tr("Traduction en norvégien")); addAuthor(ui->m_translators_label, "JoelAs", "", tr("Traduction en norvégien"));
addAuthor(ui->m_translators_label, "Yuki", "yuki.atoh@gmail.com", tr("Traduction en japonais")); addAuthor(ui->m_translators_label, "Yuki", "yuki.atoh@gmail.com", tr("Traduction en japonais"));
addAuthor(ui->m_translators_label, "Jung Kwang-Ho", "jkh2rokmc@daum.net", tr("Traduction en coréen"));
addAuthor(ui->m_translators_label, "Nathalie", "nathalie.roussier@giz.de", tr("Traduction en mongol")); addAuthor(ui->m_translators_label, "Nathalie", "nathalie.roussier@giz.de", tr("Traduction en mongol"));
addAuthor(ui->m_translators_label, "Uroš Platiše", "uros.platise@energycon.eu", tr("Traduction en slovène")); addAuthor(ui->m_translators_label, "Uroš Platiše", "uros.platise@energycon.eu", tr("Traduction en slovène"));
} }

View File

@@ -364,7 +364,6 @@ void GeneralConfigurationPage::fillLang()
ui->m_lang_cb->addItem(QET::Icons::hr, tr("Croate"), "hr"); ui->m_lang_cb->addItem(QET::Icons::hr, tr("Croate"), "hr");
ui->m_lang_cb->addItem(QET::Icons::it, tr("Italien"), "it"); ui->m_lang_cb->addItem(QET::Icons::it, tr("Italien"), "it");
ui->m_lang_cb->addItem(QET::Icons::jp, tr("Japonais"), "ja"); ui->m_lang_cb->addItem(QET::Icons::jp, tr("Japonais"), "ja");
ui->m_lang_cb->addItem(QET::Icons::ko, tr("Coréen"), "ko");
ui->m_lang_cb->addItem(QET::Icons::pl, tr("Polonais"), "pl"); ui->m_lang_cb->addItem(QET::Icons::pl, tr("Polonais"), "pl");
ui->m_lang_cb->addItem(QET::Icons::pt, tr("Portugais"), "pt"); ui->m_lang_cb->addItem(QET::Icons::pt, tr("Portugais"), "pt");
ui->m_lang_cb->addItem(QET::Icons::ro, tr("Roumains"), "ro"); ui->m_lang_cb->addItem(QET::Icons::ro, tr("Roumains"), "ro");