Sync with upstream master and resolve conflict in qet_de.qm

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)
+    if(UNIX AND NOT APPLE)
-    install(FILES misc/qelectrotech.xml    DESTINATION share/mime/packages)
+        install(FILES misc/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications)
-    install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH})
+        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()

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

lang/qet_de.ts

@@ -11851,7 +11851,8 @@ veuillez patienter durant l&apos;import...</source>
         <location filename="../sources/editor/ui/qetelementeditor.cpp" line="1361"/>
         <source>L&apos;enregistrement à échoué,
 les conditions requises ne sont pas valides</source>
-        <translation>Speichervorgang gescheitert\nDie erforderlichen Bedingungen wurden nicht erfüllt</translation>
+        <translation>Speichervorgang gescheitert!
+Die erforderlichen Bedingungen wurden nicht erfüllt</translation>
     </message>
     <message>
         <location filename="../sources/editor/ui/qetelementeditor.cpp" line="1334"/>

sources/editor/ui/qetelementeditor.cpp

@@ -736,11 +736,13 @@ bool QETElementEditor::checkElement()
 	QList<QETWarning> warnings;
 	QList<QETWarning> 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
+	// Check folio report element
-		if (m_elmt_scene->elementData().m_type & ElementData::AllReport)
+	if (m_elmt_scene->elementData().m_type & ElementData::AllReport)
-		{
+	{
-			int terminal =0;
+		int terminal =0;
 
-			for(auto qgi : m_elmt_scene -> items()) {
+		for(auto qgi : m_elmt_scene -> items()) {
-				if (qgraphicsitem_cast<PartTerminal *>(qgi)) {
+			if (qgraphicsitem_cast<PartTerminal *>(qgi)) {
-					terminal ++;
+				terminal ++;
-				}
-			}
-
-			//Error folio report must have only one terminal
-			if (terminal != 1) {
-				errors << qMakePair (tr("Absence de borne"),
-									 tr("<br><b>Erreur</b> :"
-									 "<br>Les reports de folio doivent posséder une seul borne."
-									 "<br><b>Solution</b> :"
-									 "<br>Verifier que l'élément ne possède qu'une seul borne"));
 			}
 		}
 
-		// Check conductor definition element
+		//Error folio report must have only one terminal
-		if (m_elmt_scene->elementData().m_type == ElementData::ConductorDefinition)
+		if (terminal != 1) {
-		{
+			errors << qMakePair (tr("Absence de borne"),
-			int terminal =0;
+								 tr("<br><b>Erreur</b> :"
+								 "<br>Les reports de folio doivent posséder une seul borne."
+								 "<br><b>Solution</b> :"
+								 "<br>Verifier que l'élément ne possède qu'une seul borne"));
+		}
+	}
 
-			for(auto qgi : m_elmt_scene -> items()) {
+	// Check conductor definition element
-				if (qgraphicsitem_cast<PartTerminal *>(qgi)) {
+	if (m_elmt_scene->elementData().m_type == ElementData::ConductorDefinition)
-					terminal ++;
+	{
-				}
+		int terminal =0;
-			}
 
-			// Error: Conductor definition must have exactly one terminal
+		for(auto qgi : m_elmt_scene -> items()) {
-			if (terminal != 1) {
+			if (qgraphicsitem_cast<PartTerminal *>(qgi)) {
-				errors << qMakePair (tr("Nombre de bornes incorrect"),
+				terminal ++;
-									 tr("<br><b>Erreur</b> :"
-									 "<br>Les définitions de conducteur ne peuvent posséder qu'une seule borne."
-									 "<br><b>Solution</b> :"
-									 "<br>Vérifier que l'élément ne possède qu'une seule borne"));
 			}
 		}
 
+		// Error: Conductor definition must have exactly one terminal
+		if (terminal != 1) {
+			errors << qMakePair (tr("Nombre de bornes incorrect"),
+								 tr("<br><b>Erreur</b> :"
+								 "<br>Les définitions de conducteur ne peuvent posséder qu'une seule borne."
+								 "<br><b>Solution</b> :"
+								 "<br>Vérifier que l'élément ne possède qu'une seule borne"));
+		}
+	}
+
 	if (!errors.count() && !warnings.count()) {
 		return(true);
 	}

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)