diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f2d1a9b8..5dd6eb707 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ include(cmake/hoto_update_cmake_message.cmake) cmake_minimum_required(VERSION 3.14...3.19 FATAL_ERROR) project(qelectrotech - VERSION 0.8.0 + VERSION 0.9.0 DESCRIPTION "QET is a CAD/CAE editor focusing on schematics drawing features." HOMEPAGE_URL "https://qelectrotech.org/" LANGUAGES CXX) diff --git a/cmake/fetch_pugixml.cmake b/cmake/fetch_pugixml.cmake index ff118cc72..b5f870bea 100644 --- a/cmake/fetch_pugixml.cmake +++ b/cmake/fetch_pugixml.cmake @@ -21,6 +21,6 @@ Include(FetchContent) FetchContent_Declare( pugixml GIT_REPOSITORY https://github.com/zeux/pugixml.git - GIT_TAG v1.11.1) + GIT_TAG v1.11.4) FetchContent_MakeAvailable(pugixml) diff --git a/cmake/fetch_singleapplication.cmake b/cmake/fetch_singleapplication.cmake index e2d7758e5..c01cc408c 100644 --- a/cmake/fetch_singleapplication.cmake +++ b/cmake/fetch_singleapplication.cmake @@ -26,6 +26,6 @@ Include(FetchContent) FetchContent_Declare( SingleApplication GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git - GIT_TAG v3.1.5) + GIT_TAG v3.2.0) FetchContent_MakeAvailable(SingleApplication) diff --git a/cmake/qet_compilation_vars.cmake b/cmake/qet_compilation_vars.cmake index e7e155bad..5fe2d715e 100644 --- a/cmake/qet_compilation_vars.cmake +++ b/cmake/qet_compilation_vars.cmake @@ -52,6 +52,8 @@ set(QET_RES_FILES ${QET_DIR}/sources/editor/ui/lineeditor.ui ${QET_DIR}/sources/editor/ui/polygoneditor.ui ${QET_DIR}/sources/editor/ui/rectangleeditor.ui + ${QET_DIR}/sources/editor/ui/qetelementeditor.ui + ${QET_DIR}/sources/editor/ui/terminaleditor.ui ${QET_DIR}/sources/ElementsCollection/ui/renamedialog.ui ${QET_DIR}/sources/factory/ui/addtabledialog.ui ${QET_DIR}/sources/NameList/ui/namelistdialog.ui @@ -260,12 +262,8 @@ set(QET_SRC_FILES ${QET_DIR}/sources/editor/elementscene.h ${QET_DIR}/sources/editor/elementview.cpp ${QET_DIR}/sources/editor/elementview.h - ${QET_DIR}/sources/editor/qetelementeditor.cpp - ${QET_DIR}/sources/editor/qetelementeditor.h ${QET_DIR}/sources/editor/styleeditor.cpp ${QET_DIR}/sources/editor/styleeditor.h - ${QET_DIR}/sources/editor/terminaleditor.cpp - ${QET_DIR}/sources/editor/terminaleditor.h ${QET_DIR}/sources/editor/esevent/eseventaddarc.cpp ${QET_DIR}/sources/editor/esevent/eseventaddarc.h @@ -320,8 +318,12 @@ set(QET_SRC_FILES ${QET_DIR}/sources/editor/ui/polygoneditor.h ${QET_DIR}/sources/editor/ui/rectangleeditor.cpp ${QET_DIR}/sources/editor/ui/rectangleeditor.h + ${QET_DIR}/sources/editor/ui/terminaleditor.cpp + ${QET_DIR}/sources/editor/ui/terminaleditor.h ${QET_DIR}/sources/editor/ui/texteditor.cpp ${QET_DIR}/sources/editor/ui/texteditor.h + ${QET_DIR}/sources/editor/ui/qetelementeditor.h + ${QET_DIR}/sources/editor/ui/qetelementeditor.cpp ${QET_DIR}/sources/editor/UndoCommand/pastepartscommand.cpp ${QET_DIR}/sources/editor/UndoCommand/pastepartscommand.h @@ -371,6 +373,8 @@ set(QET_SRC_FILES ${QET_DIR}/sources/print/projectprintwindow.cpp ${QET_DIR}/sources/print/projectprintwindow.h + ${QET_DIR}/sources/properties/elementdata.cpp + ${QET_DIR}/sources/properties/elementdata.h ${QET_DIR}/sources/properties/propertiesinterface.cpp ${QET_DIR}/sources/properties/propertiesinterface.h ${QET_DIR}/sources/properties/reportproperties.cpp