Fix https://github.com/qelectrotech/qelectrotech-source-mirror/issues/439

Update qet_cs.ts

.github/workflows/auto-doxygen.yml

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

CMakeLists.txt

@@ -14,10 +14,12 @@
 # You should have received a copy of the GNU General Public License
 # along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 
-cmake_minimum_required(VERSION 3.5...4.2)
+include(cmake/hoto_update_cmake_message.cmake)
+
+cmake_minimum_required(VERSION 3.14...3.19 FATAL_ERROR)
 
 project(qelectrotech
-  VERSION 0.100.0
+  VERSION 0.9.0
   DESCRIPTION "QET is a CAD/CAE editor focusing on schematics drawing features."
   HOMEPAGE_URL "https://qelectrotech.org/"
   LANGUAGES CXX)
@@ -25,16 +27,9 @@ project(qelectrotech
 include(cmake/copyright_message.cmake)
 
 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
-option(PACKAGE_TESTS "Build the tests" NO)
+option(PACKAGE_TESTS "Build the tests" ON)
 if(PACKAGE_TESTS)
   message("Add sub directory tests")
   add_subdirectory(tests)
@@ -48,16 +43,42 @@ include(cmake/git_last_commit_sha.cmake)
 include(cmake/fetch_kdeaddons.cmake)
 include(cmake/fetch_singleapplication.cmake)
 include(cmake/fetch_pugixml.cmake)
+include(cmake/qet_compilation_vars.cmake)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
+set(CMAKE_AUTOMOC 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)
+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
 include(cmake/define_definitions.cmake)
 
-qt_add_executable(
+add_executable(
   ${PROJECT_NAME}
   ${QET_RES_FILES}
   ${QET_SRC_FILES}
@@ -65,24 +86,13 @@ qt_add_executable(
   ${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(
   ${PROJECT_NAME}
   PUBLIC
   PRIVATE
   pugixml::pugixml
   SingleApplication::SingleApplication
-  SQLite::SQLite3
-  ${KF6_PRIVATE_LIBRARIES}
+  ${KF5_PRIVATE_LIBRARIES}
   ${QET_PRIVATE_LIBRARIES}
   )
 
@@ -115,11 +125,11 @@ target_include_directories(
   ${QET_DIR}/sources/NameList
   ${QET_DIR}/sources/NameList/ui
   ${QET_DIR}/sources/utils
+  ${QET_DIR}/pugixml/src
   ${QET_DIR}/sources/dataBase
   ${QET_DIR}/sources/dataBase/ui
   ${QET_DIR}/sources/factory/ui
   ${QET_DIR}/sources/print
-  ${QET_DIR}/sources/svg
   )
 
 install(TARGETS ${PROJECT_NAME})
@@ -139,7 +149,6 @@ install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share
 install(FILES misc/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications)
 install(FILES misc/qelectrotech.xml DESTINATION share/mime/packages)
 install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH})
-if(NOT QMFILES_AS_RESOURCE)
-  install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})
-endif()
+install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})
+
 endif()

CREDIT

@@ -266,3 +266,35 @@ Dank aan Chipsterjulien voor de pakkette Archlinux AUR
 Dank aan Elbert voor de pakkette  OS/2
 Dank aan Zloidemon fvoor de pakkette  (port GCC)
 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에게 감사드립니다.
+

ELEMENTS.LICENSE

@@ -214,3 +214,20 @@ QElectroTech と一緒に提供される要素コレクションは現状のま
 ライセンスのコピーを見るには http://creativecommons.org/licenses/by/3.0/ にアクセスするか、
 「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.

README.md

@@ -59,9 +59,6 @@ Here are the technical choices made for the software development:
 
 If you wish to be informed of the latest developments, browse the [archive](https://listengine.tuxfamily.org/lists.tuxfamily.org/qet/) of the project mailing list where all commits (changes) are registered. This archive is publicly available, you don't need any account to access it.
 
-### Build QElectroTech under Windows
-To build QElectroTech under microsoft Windows, please follow [these instructions (french)](md/fr/fr_window_build_summary.md)
-
 
 # Features
 

build-aux/windows/QET64.nsi

@@ -109,6 +109,7 @@
 	
 	; 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 "Korean"
         !insertmacro MUI_LANGUAGE "French"
         !insertmacro MUI_LANGUAGE "Spanish"
         !insertmacro MUI_LANGUAGE "Russian"
@@ -125,8 +126,7 @@
         !insertmacro MUI_LANGUAGE "Dutch"
         !insertmacro MUI_LANGUAGE "Dutch_Belgium"
         !insertmacro MUI_LANGUAGE "Danish"
-        !insertmacro MUI_LANGUAGE "Swedish"
-	!insertmacro MUI_RESERVEFILE_LANGDLL
+    !insertmacro MUI_RESERVEFILE_LANGDLL
 	
 	!include lang_extra.nsh
 	!include lang_extra_fr.nsh
@@ -405,3 +405,6 @@ Function un.onInit
 FunctionEnd
 
 
+
+
+

build-aux/windows/lang_extra.nsh

@@ -17,8 +17,29 @@
         LangString var2              ${LANG_ENGLISH}  "languagues files"
         LangString var3              ${LANG_ENGLISH}  "Examples of cartridges"
         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 wrongArch         ${LANG_POLISH}  "To oprogramowanie jest przeznaczone wyłącznie dla komputerów 64 bitowych."
         LangString Elements          ${LANG_POLISH}  "Elementy"

cmake/define_definitions.cmake

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

cmake/developer_options.cmake

@@ -31,8 +31,5 @@ add_definitions(-DQT_MESSAGELOGCONTEXT)
 # In order to do so, uncomment the following line.
 #add_definitions(-DTODO_LIST)
 
-# Build with KF6
-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)
+# Build with KF5
+option(BUILD_WITH_KF5 "Build with KF5" ON)

cmake/fetch_kdeaddons.cmake

@@ -1,4 +1,4 @@
-# Copyright 2006-2026 The QElectroTech Team
+# Copyright 2006 The QElectroTech Team
 # This file is part of QElectroTech.
 #
 # QElectroTech is free software: you can redistribute it and/or modify
@@ -14,42 +14,54 @@
 # You should have received a copy of the GNU General Public License
 # along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 
-option(BUILD_KF6 "Build KF6 libraries, use system ones otherwise" OFF)
-if(BUILD_KF6)
-  block(PROPAGATE KF6_GIT_TAG)
-    message(STATUS " - fetch_kdeaddons")
-    set(KDE_SKIP_TEST_SETTINGS ON)
-    set(KCOREADDONS_USE_QML OFF)
-    set(KWIDGETSADDONS_USE_QML OFF)
-    set(BUILD_TESTING OFF)
-    set(BUILD_DESIGNERPLUGIN OFF)
-    set(BUILD_QCH OFF)
-    set(BUILD_SHARED_LIBS OFF)
+message(" - fetch_kdeaddons")
 
-    Include(FetchContent)
+if(DEFINED BUILD_WITH_KF5)
+  Include(FetchContent)
 
-    if(NOT DEFINED KF6_GIT_TAG)
-      set(KF6_GIT_TAG v6.22.0)
+  option(BUILD_KF5 "Build KF5 libraries, use system ones otherwise" YES)
+
+  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()
 
+    # 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(
       kcoreaddons
       GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git
-      GIT_TAG        ${KF6_GIT_TAG})
+      GIT_TAG        ${KF5_GIT_TAG})
     FetchContent_MakeAvailable(kcoreaddons)
 
     FetchContent_Declare(
       kwidgetsaddons
       GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git
-      GIT_TAG        ${KF6_GIT_TAG})
+      GIT_TAG        ${KF5_GIT_TAG})
     FetchContent_MakeAvailable(kwidgetsaddons)
-  endblock()
-else()
-  find_package(KF6CoreAddons REQUIRED)
-  find_package(KF6WidgetsAddons REQUIRED)
-endif()
+  else()
+    find_package(KF5CoreAddons REQUIRED)
+    find_package(KF5WidgetsAddons REQUIRED)
+  endif()
 
-set(KF6_PRIVATE_LIBRARIES
-  KF6::CoreAddons
-  KF6::WidgetsAddons
-)
+  set(KF5_PRIVATE_LIBRARIES
+    KF5::WidgetsAddons
+    KF5::CoreAddons
+    )
+endif()

cmake/fetch_pugixml.cmake

@@ -1,4 +1,4 @@
-# Copyright 2006-2026 The QElectroTech Team
+# Copyright 2006 The QElectroTech Team
 # This file is part of QElectroTech.
 #
 # QElectroTech is free software: you can redistribute it and/or modify
@@ -14,14 +14,18 @@
 # You should have received a copy of the GNU General Public License
 # along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
 
-option(BUILD_PUGIXML "Build pugixml library, use system one otherwise" OFF)
+message(" - fetch_pugixml")
+
+Include(FetchContent)
+
+option(BUILD_PUGIXML "Build pugixml library, use system one otherwise" YES)
+
 if(BUILD_PUGIXML)
-  Include(FetchContent)
-  message(" - fetch pugixml")
+
   FetchContent_Declare(
     pugixml
     GIT_REPOSITORY https://github.com/zeux/pugixml.git
-    GIT_TAG        v1.15)
+    GIT_TAG        v1.11.4)
 
   FetchContent_MakeAvailable(pugixml)
 else()

cmake/fetch_singleapplication.cmake

@@ -1,4 +1,4 @@
-# Copyright 2006-2026 The QElectroTech Team
+# Copyright 2006 The QElectroTech Team
 # This file is part of QElectroTech.
 #
 # QElectroTech is free software: you can redistribute it and/or modify
@@ -16,6 +16,9 @@
 
 message(" - fetch_singleapplication")
 
+# https://github.com/itay-grudev/SingleApplication/issues/18
+#qmake
+#DEFINES += QAPPLICATION_CLASS=QGuiApplication
 set(QAPPLICATION_CLASS QApplication)
 
 Include(FetchContent)
@@ -23,6 +26,6 @@ Include(FetchContent)
 FetchContent_Declare(
   SingleApplication
   GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
-  GIT_TAG        v3.5.4)
+  GIT_TAG        v3.2.0)
 
 FetchContent_MakeAvailable(SingleApplication)

cmake/hoto_update_cmake_message.cmake

@@ -0,0 +1,25 @@
+# Copyright 2006 The QElectroTech Team
+# This file is part of QElectroTech.
+#
+# QElectroTech is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# QElectroTech is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
+
+if(${CMAKE_VERSION} VERSION_LESS 3.14)
+  message(
+    "_____________________________________________________________________")
+  message("to update Cmake on linux:")
+  message("https://github.com/Kitware/CMake/")
+  message("linux => cmake-3.19.1-Linux-x86_64.sh")
+  message("         sudo ./cmake.sh --prefix=/usr/local/ --exclude-subdir")
+  message("windows good luck :)")
+endif()

cmake/qet_compilation_vars.cmake

@@ -17,8 +17,6 @@
 message(" - qet_compilation_vars")
 
 set(QET_COMPONENTS
-  Core
-  Gui
   LinguistTools
   PrintSupport
   Xml
@@ -111,12 +109,6 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/borderproperties.h
   ${QET_DIR}/sources/bordertitleblock.cpp
   ${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.h
   ${QET_DIR}/sources/conductornumexport.cpp
@@ -421,6 +413,10 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.cpp
   ${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.h
 
+  ${QET_DIR}/pugixml/src/pugiconfig.hpp
+  ${QET_DIR}/pugixml/src/pugixml.cpp
+  ${QET_DIR}/pugixml/src/pugixml.hpp
+
   ${QET_DIR}/sources/qetgraphicsitem/conductor.cpp
   ${QET_DIR}/sources/qetgraphicsitem/conductor.h
   ${QET_DIR}/sources/qetgraphicsitem/conductortextitem.cpp
@@ -499,9 +495,6 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.cpp
   ${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.h
   ${QET_DIR}/sources/titleblock/dimensionwidget.cpp
@@ -713,8 +706,6 @@ set(QET_SRC_FILES
 
   ${QET_DIR}/sources/xml/terminalstripitemxml.cpp
   ${QET_DIR}/sources/xml/terminalstripitemxml.h
-  ${QET_DIR}/sources/xml/terminalstriplayoutpatternxml.cpp
-  ${QET_DIR}/sources/xml/terminalstriplayoutpatternxml.h
   )
 
 set(TS_FILES
@@ -735,17 +726,19 @@ set(TS_FILES
   ${QET_DIR}/lang/qet_mn.ts
   ${QET_DIR}/lang/qet_nb.ts
   ${QET_DIR}/lang/qet_nl.ts
-  ${QET_DIR}/lang/qet_nl_BE.ts
+  ${QET_DIR}/lang/qet_nl_BE.ts  
   ${QET_DIR}/lang/qet_no.ts
   ${QET_DIR}/lang/qet_pl.ts
   ${QET_DIR}/lang/qet_pt.ts
   ${QET_DIR}/lang/qet_pt_BR.ts
   ${QET_DIR}/lang/qet_ro.ts
+  ${QET_DIR}/lang/qet_rs.ts  
   ${QET_DIR}/lang/qet_ru.ts
   ${QET_DIR}/lang/qet_sk.ts
   ${QET_DIR}/lang/qet_sl.ts
   ${QET_DIR}/lang/qet_sr.ts
   ${QET_DIR}/lang/qet_sv.ts
   ${QET_DIR}/lang/qet_tr.ts
+  ${QET_DIR}/lang/qet_uk.ts
   ${QET_DIR}/lang/qet_zh.ts
   )

doc/QElectroTech.qch

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

lang/qet_cs.ts

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

man/files/ko/man1/qelectrotech.1

@@ -0,0 +1,76 @@
+.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/>

md/fr/fr_window_build_msys2.md

@@ -1,101 +0,0 @@
-Compiler QElectroTech sous microsoft Windows 10 et 11 avec MSYS2
-================================
-Ce document décrit les étapes nécessaire afin de compilé QElectroTech sous Windows avec Qt6 et cmake en utilisant MSYS2.
-
-# MSYS2
-L'ensemble des outils nécessaire au développement et à la compilation de QElectroTech sous Windows sera installé par l’intermédiaire de [MSYS2](https://www.msys2.org/). Cela comprend entre autre le framework [Qt6](https://www.qt.io/development/qt-framework/qt6), les outils cmake, les dépendances ([kde framework](https://develop.kde.org/docs/), [sqlite](https://sqlite.org/), [pugixml](https://pugixml.org/)), les outils de compilation [minGW](https://www.mingw-w64.org/)...
-
->Il sera nécessaire d'utiliser [winget](https://learn.microsoft.com/fr-fr/windows/package-manager/winget/), celui-ci est présent par défaut sous Windows 11, dans le cas de Windows 10, winget peut necessité d'être activé manuellement
-
-# Installer GIT et MSYS2 avec winget
-Avec power shell.
-```
-winget install Git.Git
-```
-puis
-```
-winget install MSYS2.MSYS2
-```
-
-
-
-## Mise à jour de MSYS2
-Lors de la première utilisation de MSYS2 il est nécessaire de mettre celui-ci à jour.
-
-Lancer "MSYS2 MSYS" depuis le menu démarré de Windows.
-Une fenêtre avec un shell s'ouvre, dans celui-ci lancer la commande :
-```
-pacman -Syu
-```
-A la fin de la mise à jour MSYS2 MSYS se fermera automatiquement. Ouvrez le à nouveau et relancé la commande
-```
-pacman -Syu
-```
-
-## Installation des outils de devellopement
-Toujours dans le shell MSYS2 MSYS lancer la commande suivante.
-```
-pacman -S mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-qt6-svg mingw-w64-ucrt-x86_64-qt6-base mingw-w64-ucrt-x86_64-sqlite3 mingw-w64-ucrt-x86_64-pugixml mingw-w64-ucrt-x86_64-kcoreaddons mingw-w64-ucrt-x86_64-kwidgetsaddons mingw-w64-ucrt-x86_64-extra-cmake-modules mingw-w64-ucrt-x86_64-gdb mingw-w64-ucrt-x86_64-qt6-translations mingw-w64-ucrt-x86_64-qt6-tools
-```
-> La quantité de paquets à installer est conséquent, en fonction de votre connexion internet cela peut prendre plusieurs dizaine de minute
-
-L'ensemble des outils est mantenant installé 😀
-
-# Installer Qt creator
-Télécharger [l'installateur online de Qt](https://www.qt.io/development/download-qt-installer-oss) et lancer l'installation en suivant les indications de ce dernier.
-
->Dans le cas où vous comptez utilisé Qt Creator uniquement pour développez QElectroTech, lors de l'installation choisissez l'option "installation personnalisée" puis dans la page suivante sélectionné uniquement Qt Creator.
-
-## Configurer Qt creator
-Ouvrir Qt creator puis rendez vous dans "édition -> préférence -> kit"
-
-### Versions de Qt
-
-- Cliquer sur _ajouter_
-- Renseigner _Chemin de qmake_ (exemple C:\\msys64\\ucrt64\\bin\\qmake.exe).
-- Dans le champ _Nom :_ ajouter (msys2).
-
-![](assets/windows_msys2_setup/qt_version.png)
-
-### Compilateurs
-- Cliquer sur _ajouter_ puis choisir _MinGW_.
-- Renseigner _Emplacement du compilateur C_ (exemple C:\\msys64\\ucrt64\\bin\\g++.exe).
-- Dans le champ _Nom :_ ajouter (msys2).
-
-![](assets/windows_msys2_setup/compiler.png)
-
-### Débogueurs
-- Cliquer sur _ajouter_
-- Renseigner  _Chemin :_ (exemple C:\\msys64\\ucrt64\\bin\\gdb.exe).
-- Dans le champ _Nom :_ ajouter (msys2).
-
-![](assets/windows_msys2_setup/debugger.png)
-
-### cmake
-- Outils -> _Ajouter_
-- Renseigner  _Chemin :_ (exemple C:\\msys64\\ucrt64\\bin\\cmake.exe).
-- Dans le champ _Nom :_ ajouter (msys2).
-
-![](assets/windows_msys2_setup/cmake.png)
-
-### KIT
-Maintenant que tous les prérequis sont fait nous allons crée un kit utilisant les outils fournis par MSYS2. Cliquer sur _Ajouter_, un nouveau kit _manuel_ apparaît, nommer celui-ci par exemple _Qt6 msys2_ puis renseigner le compilateur, le débogueur, la version de Qt et Outils CMake en choisissant à chaque fois ceux que nous venons de créer.
-puis cliquer sur _appliquer_.
-
-![](assets/windows_msys2_setup/kit.png)
-
-Bravo 🥳🥳 vous avez terminé l'installation de la totalité des outils de développement.
-
-# Clonez le dépôts de QElectrotech
-Clonez le dépôt de QElectroTech comme vous le faite habituellement, sinon utilisez les commandes suivante dans power shell.
-
-Crée et/ou se rendre dans le dossier dans lequel vous voulez clonez le dépôt (dans l'exemple nous allons crée un dossier QElectroTech dans C:)
-
-```
-mkdir C:\QElectroTech
-cd C:\QElectroTech
-
-git clone --recursive https://github.com/qelectrotech/qelectrotech-source-mirror.git
-```
-
-Une fois le dépôt cloné lancer Qt creator puis choisir d'ouvrir un projet existant, en choisissant le _CMakeLists.txt_ se trouvant à la racine du projet QElectroTech, enfin dans l'assistant de création de projet choisir comme kit le kit que nous avons créer précédemment.

md/fr/fr_window_build_summary.md

@@ -1,13 +0,0 @@
-Compiler QElectroTech sous microsoft Windows 10 et 11
-================================
-Compiler QElectroTech pour et/ou sous Windows peut être effectué avec plusieurs méthode différente.
-Ce document énumère uniquement les différentes méthode possible
-
-N'est mentionné que les étapes nécessaire afin de compilé QElectroTech sous Windows avec Qt6 et cmake. Ce document ne traite pas la compilation avec Qt5 et qmake.
-
->QElectroTech 0.100 est la dernière version à utiliser Qt5. Les version suivante sont développé avec Qt6 et utilise cmake au lieu de qmake.
-
-Il existe deux méthodes pour cela :
-
-1. [Utiliser msys2 (méthode recommandé)](fr_window_build_msys2.md)
-2. Télécharger et compiler l'ensemble des dépendances (non rédigé)

misc/org.qelectrotech.qelectrotech.desktop

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

misc/qelectrotech.appdata.xml

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

misc/qelectrotech.xml

@@ -14,6 +14,7 @@
 		<comment xml:lang="fr">Fichier projet QElectroTech</comment>
 		<comment xml:lang="it">File del progetto 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="pl">Plik projektu QElectrotech</comment>
 		<comment xml:lang="pt">Ficheiro de projecto QElectroTech</comment>
@@ -34,6 +35,7 @@
 		<comment xml:lang="fr">Fichier élément QElectroTech</comment>
 		<comment xml:lang="it">File del progetto 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="pl">Plik elementu QElectroTech</comment>
 		<comment xml:lang="pt">Ficheiro de projecto QElectroTech</comment>
@@ -54,6 +56,7 @@
 		<comment xml:lang="fr">Modèle de cartouche QElectroTech</comment>
 		<comment xml:lang="it">Modello di cartiglio per 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="pl">Szablon tabliczki rysunkowej QElectroTech</comment>
 		<comment xml:lang="pt">Modelo de moldura QElectroTech</comment>

sources/ElementsCollection/elementscollectionmodel.cpp

@@ -26,7 +26,12 @@
 #include "xmlprojectelementcollectionitem.h"
 
 #include <QFutureWatcher>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
 #include <QtConcurrentMap>
+#else
+#include <QtConcurrentRun>
+#endif
+
 /**
 	@brief ElementsCollectionModel::ElementsCollectionModel
 	Constructor
@@ -293,8 +298,15 @@ void ElementsCollectionModel::loadCollections(bool common_collection,
 		&QFutureWatcher<void>::finished,
 		watcher,
 		&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);
+#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);
 }
 

sources/ElementsCollection/elementslocation.cpp

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

sources/ElementsCollection/elementslocation.h

@@ -20,7 +20,7 @@
 
 #include "../NameList/nameslist.h"
 #include "../diagramcontext.h"
-#include "pugixml.hpp"
+#include "pugixml/src/pugixml.hpp"
 
 #include <QIcon>
 #include <QString>

sources/ElementsCollection/xmlelementcollection.cpp

@@ -58,6 +58,10 @@ XmlElementCollection::XmlElementCollection(QETProject *project) :
 		QChar(0x30A4), QChar(0x30F3), QChar(0x30D0), QChar(0x30FC),
 		QChar(0x30C8), QChar(0x3055), QChar(0x308C), QChar(0x305F),
 		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] = {
 		QChar(0x0418), QChar(0x043C), QChar(0x043F), QChar(0x043E),
 		QChar(0x0440), QChar(0x0442), QChar(0x0438), QChar(0x0440),
@@ -88,6 +92,8 @@ XmlElementCollection::XmlElementCollection(QETProject *project) :
 	names.addName("it",    "Elementi importati");
 	names.addName("ja",    QString(japanese_data, 10));
 	//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_BE", "Elementen geïmporteerd");
 	names.addName("pl",    "Elementy importowane");

sources/NameList/nameslist.h

@@ -17,7 +17,7 @@
 */
 #ifndef NAMES_LIST_H
 #define NAMES_LIST_H
-#include "pugixml.hpp"
+#include "pugixml/src/pugixml.hpp"
 
 #include <QtXml>
 /**

sources/TerminalStrip/GraphicsItem/terminalstripdrawer.cpp

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

sources/TerminalStrip/physicalterminal.cpp

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

sources/diagramcontext.h

@@ -17,7 +17,7 @@
 */
 #ifndef DIAGRAM_CONTEXT_H
 #define DIAGRAM_CONTEXT_H
-#include "pugixml.hpp"
+#include "pugixml/src/pugixml.hpp"
 
 #include <QDomElement>
 #include <QHash>

sources/machine_info.cpp

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

sources/print/projectprintwindow.cpp

@@ -190,28 +190,25 @@ ProjectPrintWindow::~ProjectPrintWindow()
  */
 void ProjectPrintWindow::requestPaint()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-#ifdef Q_OS_WIN
-	auto screen = this->screen();
-	if(screen)
-	{
-#ifdef QT_DEBUG
-		qDebug() << "--";
-		qDebug() << "DiagramPrintDialog::print  printer_->resolution() before " << m_printer->resolution();
-		qDebug() << "DiagramPrintDialog::print  screennumber " << screen->name();
-#endif
+	#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+		#ifdef Q_OS_WIN
+			#ifdef QT_DEBUG
+			qDebug() << "--";
+			qDebug() << "DiagramPrintDialog::print  printer_->resolution() before " << m_printer->resolution();
+			qDebug() << "DiagramPrintDialog::print  screennumber " << QApplication::desktop()->screenNumber();
+			#endif
 
-		qreal dotsPerInch = (qreal)screen->logicalDotsPerInch();
-		m_printer->setResolution(dotsPerInch);
+			QScreen *srn = QApplication::screens().at(QApplication::desktop()->screenNumber());
+			qreal dotsPerInch = (qreal)srn->logicalDotsPerInch();
+			m_printer->setResolution(dotsPerInch);
 
-#ifdef QT_DEBUG
-		qDebug() << "DiagramPrintDialog::print  dotsPerInch " << dotsPerInch;
-		qDebug() << "DiagramPrintDialog::print  printer_->resolution() after" << m_printer->resolution();
-		qDebug() << "--";
-#endif
-	}
-#endif
-#endif
+			#ifdef QT_DEBUG
+				qDebug() << "DiagramPrintDialog::print  dotsPerInch " << dotsPerInch;
+				qDebug() << "DiagramPrintDialog::print  printer_->resolution() after" << m_printer->resolution();
+			qDebug() << "--";
+			#endif
+		#endif
+	#endif
 
 	if (!m_project->diagrams().count()) {
 		return;
@@ -268,9 +265,9 @@ void ProjectPrintWindow::printDiagram(Diagram *diagram, bool fit_page, QPainter
 #if TODO_LIST
 #pragma message("@TODO remove code for QT 6 or later")
 #endif
-		qDebug()<<"Help code for QT 6 or later";
-		auto printed_rect = full_page ? printer->paperRect(QPrinter::Millimeter) :
-								printer->pageRect(QPrinter::Millimeter);
+	qDebug()<<"Help code for QT 6 or later";
+	auto printed_rect = full_page ? printer->paperRect(QPrinter::Millimeter) :
+									printer->pageRect(QPrinter::Millimeter);
 #endif
 		auto used_width  = printed_rect.width();
 		auto used_height = printed_rect.height();
@@ -344,7 +341,7 @@ QRect ProjectPrintWindow::diagramRect(Diagram *diagram, const ExportProperties &
 		diagram_rect.setHeight(diagram_rect.height() - titleblock_height);
 	}
 
-	//Adjust the border of diagram to 1px (width of the line)
+		//Adjust the border of diagram to 1px (width of the line)
 	diagram_rect.adjust(0,0,1,1);
 
 	return (diagram_rect.toAlignedRect());
@@ -359,7 +356,7 @@ QRect ProjectPrintWindow::diagramRect(Diagram *diagram, const ExportProperties &
  * with the orientation and the paper format used by the actual printer
  */
 int ProjectPrintWindow::horizontalPagesCount(
-	Diagram *diagram, const ExportProperties &option, bool full_page) const
+		Diagram *diagram, const ExportProperties &option, bool full_page) const
 {
 	QRect printable_area;
 #if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
@@ -388,7 +385,7 @@ int ProjectPrintWindow::horizontalPagesCount(
  * with the orientation and paper format used by the actual printer
  */
 int ProjectPrintWindow::verticalPagesCount(
-	Diagram *diagram, const ExportProperties &option, bool full_page) const
+		Diagram *diagram, const ExportProperties &option, bool full_page) const
 {
 	QRect printable_area;
 #if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
@@ -514,7 +511,7 @@ void ProjectPrintWindow::loadPageSetupForCurrentPrinter()
 		QString value = settings.value("orientation", "landscape").toString();
 		m_printer->setPageOrientation(
 			value == "landscape" ? QPageLayout::Landscape :
-				QPageLayout::Portrait);
+								   QPageLayout::Portrait);
 	}
 	if (settings.contains("papersize"))
 	{
@@ -783,9 +780,9 @@ void ProjectPrintWindow::print()
 void ProjectPrintWindow::on_m_date_cb_userDateChanged(const QDate &date)
 {
 	auto index = ui->m_date_from_cb->currentIndex();
-	// 0 = all date
-	// 1 = from the date
-	// 2 = at the date
+		// 0 = all date
+		// 1 = from the date
+		// 2 = at the date
 
 	if (index) { on_m_uncheck_all_clicked();  }
 	else       { on_m_check_all_pb_clicked(); }
@@ -795,7 +792,7 @@ void ProjectPrintWindow::on_m_date_cb_userDateChanged(const QDate &date)
 	{
 		auto diagram_date = diagram->border_and_titleblock.date();
 		if ( (index == 1 && diagram_date >= date) ||
-			(index == 2 && diagram_date == date) )
+			 (index == 2 && diagram_date == date) )
 			m_diagram_list_hash.value(diagram)->setChecked(true);
 	}
 

sources/qeticons.cpp

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

sources/qeticons.h

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

sources/qetxml.h

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

sources/qgimanager.cpp

@@ -70,6 +70,25 @@ 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) {
 	for (const auto &qgi : items) {
 		manage(qgi);

sources/qgimanager.h

@@ -45,6 +45,10 @@ class QGIManager {
 	public:
 	void manage(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 release(const QVector<QGraphicsItem *> &items);
 	void setDestroyQGIOnDelete(bool);

sources/recentfiles.cpp

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

sources/recentfiles.h

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

sources/titleblock/templatescollection.cpp

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

sources/titleblock/templateview.h

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

sources/titleblocktemplate.cpp

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

sources/ui/aboutqetdialog.cpp

@@ -131,6 +131,7 @@ void AboutQETDialog::setTranslators()
 	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, "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, "Uroš Platiše",                              "uros.platise@energycon.eu",      tr("Traduction en slovène"));
 }

sources/ui/configpage/generalconfigurationpage.cpp

@@ -364,6 +364,7 @@ void GeneralConfigurationPage::fillLang()
 	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::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::pt,		tr("Portugais"), "pt");
 	ui->m_lang_cb->addItem(QET::Icons::ro,		tr("Roumains"), "ro");