diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e931f78a..edec55380 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,8 +162,10 @@ if (NOT MINGW) install(DIRECTORY examples DESTINATION share/qelectrotech) install(DIRECTORY titleblocks DESTINATION share/qelectrotech) install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share/doc/qelectrotech) - 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(UNIX AND NOT APPLE) + install(FILES misc/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications) + install(FILES misc/qelectrotech.xml DESTINATION ${QET_MIME_PACKAGE_PATH}) + install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH}) + endif() install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH}) endif() diff --git a/build-aux/snap/snapcraft.yaml b/build-aux/snap/snapcraft.yaml index f0f93168b..284c1b955 100644 --- a/build-aux/snap/snapcraft.yaml +++ b/build-aux/snap/snapcraft.yaml @@ -53,6 +53,7 @@ parts: qet-tb-generator: plugin: python source: https://github.com/raulroda/qet_tb_generator-plugin.git + source-tag: v1.31 python-packages: [PySimpleGUI] stage-packages: - python3-lxml diff --git a/lang/qet_de.qm b/lang/qet_de.qm index 0d1d37bff..f51e6561a 100644 Binary files a/lang/qet_de.qm and b/lang/qet_de.qm differ diff --git a/lang/qet_de.ts b/lang/qet_de.ts index eed74a8d0..22952cf9f 100644 --- a/lang/qet_de.ts +++ b/lang/qet_de.ts @@ -11851,7 +11851,8 @@ veuillez patienter durant l'import... L'enregistrement à échoué, les conditions requises ne sont pas valides - Speichervorgang gescheitert\nDie erforderlichen Bedingungen wurden nicht erfüllt + Speichervorgang gescheitert! +Die erforderlichen Bedingungen wurden nicht erfüllt diff --git a/sources/editor/ui/qetelementeditor.cpp b/sources/editor/ui/qetelementeditor.cpp index 45530dc98..31ce8482d 100644 --- a/sources/editor/ui/qetelementeditor.cpp +++ b/sources/editor/ui/qetelementeditor.cpp @@ -736,11 +736,13 @@ bool QETElementEditor::checkElement() QList warnings; QList errors; - // Warning #1: Element haven't got terminal + // Warning #1: Element does not have (enough) terminals // (except for report and conductor definition, because they must have one terminal and this checking is done below) + // (another exception: "thumbnails" aka "front-views" may/should not have terminals) if (!m_elmt_scene -> containsTerminals() && !(m_elmt_scene->elementData().m_type & ElementData::AllReport) && - m_elmt_scene->elementData().m_type != ElementData::ConductorDefinition) { + m_elmt_scene->elementData().m_type != ElementData::ConductorDefinition && + m_elmt_scene->elementData().m_type != ElementData::Thumbnail) { warnings << qMakePair( tr("Absence de borne", "warning title"), tr( @@ -749,50 +751,50 @@ bool QETElementEditor::checkElement() "warning description" ) ); - } + } - // Check folio report element - if (m_elmt_scene->elementData().m_type & ElementData::AllReport) - { - int terminal =0; + // Check folio report element + if (m_elmt_scene->elementData().m_type & ElementData::AllReport) + { + int terminal =0; - for(auto qgi : m_elmt_scene -> items()) { - if (qgraphicsitem_cast(qgi)) { - terminal ++; - } - } - - //Error folio report must have only one terminal - if (terminal != 1) { - errors << qMakePair (tr("Absence de borne"), - tr("
Erreur :" - "
Les reports de folio doivent posséder une seul borne." - "
Solution :" - "
Verifier que l'élément ne possède qu'une seul borne")); + for(auto qgi : m_elmt_scene -> items()) { + if (qgraphicsitem_cast(qgi)) { + terminal ++; } } - // Check conductor definition element - if (m_elmt_scene->elementData().m_type == ElementData::ConductorDefinition) - { - int terminal =0; + //Error folio report must have only one terminal + if (terminal != 1) { + errors << qMakePair (tr("Absence de borne"), + tr("
Erreur :" + "
Les reports de folio doivent posséder une seul borne." + "
Solution :" + "
Verifier que l'élément ne possède qu'une seul borne")); + } + } - for(auto qgi : m_elmt_scene -> items()) { - if (qgraphicsitem_cast(qgi)) { - terminal ++; - } - } + // Check conductor definition element + if (m_elmt_scene->elementData().m_type == ElementData::ConductorDefinition) + { + int terminal =0; - // Error: Conductor definition must have exactly one terminal - if (terminal != 1) { - errors << qMakePair (tr("Nombre de bornes incorrect"), - tr("
Erreur :" - "
Les définitions de conducteur ne peuvent posséder qu'une seule borne." - "
Solution :" - "
Vérifier que l'élément ne possède qu'une seule borne")); + for(auto qgi : m_elmt_scene -> items()) { + if (qgraphicsitem_cast(qgi)) { + terminal ++; } } + // Error: Conductor definition must have exactly one terminal + if (terminal != 1) { + errors << qMakePair (tr("Nombre de bornes incorrect"), + tr("
Erreur :" + "
Les définitions de conducteur ne peuvent posséder qu'une seule borne." + "
Solution :" + "
Vérifier que l'élément ne possède qu'une seule borne")); + } + } + if (!errors.count() && !warnings.count()) { return(true); } diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index 2497fa53a..0b321d927 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -2489,7 +2489,6 @@ void QETDiagramEditor::generateTerminalBlock() exeList << (QETApp::dataDir() + "/binary/qet_tb_generator.exe") << (QDir::currentPath() + "/qet_tb_generator.exe") << QStandardPaths::findExecutable("qet_tb_generator.exe") - << (QDir::homePath() + "/Application Data/qet/qet_tb_generator.exe") << "qet_tb_generator.exe" << "qet_tb_generator"; // from original code: missing ".exe" ??? #elif defined(Q_OS_MACOS)