Merge pull request #374 from plc-user/master

some minor changes

misc/org.qelectrotech.qelectrotech.desktop

@@ -10,37 +10,37 @@ MimeType=application/x-qet-project;application/x-qet-element;application/x-qet-t
 Categories=Graphics;Qt;VectorGraphics;Science;Electricity;Engineering;
 Keywords=Graphics;Science;Electricity;Engineering;
 Comment=Edit electrical diagrams.
-Comment[de]=Elektroschaltpläne erstellen und bearbeiten.
-Comment[fr]=Éditer des schémas électriques.
 Comment[ar]=تحرير مخططات كهربائية
-Comment[es]=Editar esquemas eléctricos
-Comment[ru]=Создание и редактирование электрических схем.
-Comment[ca]=Editar esquemes elèctrics.
-Comment[pt]=Criar esquemas eléctricos.
-Comment[cs]=Editor výkresů elektrických obvodů
-Comment[pl]=Edycja schematów elektrycznych
-Comment[it]=Disegnare schemi elettrici
-Comment[hr]=Uredi elektro sheme
-Comment[el]=Επεξεργασία ηλεκτρικών διαγραμμάτων
-Comment[nl]=Bewerken bedradingsdiagrammen.
 Comment[be]=Bewerken elektrisch schema.
+Comment[ca]=Editar esquemes elèctrics.
+Comment[cs]=Editor výkresů elektrických obvodů
 Comment[da]=Rediger elektriske diagrammer.
+Comment[de]=Elektroschaltpläne erstellen und bearbeiten.
+Comment[el]=Επεξεργασία ηλεκτρικών διαγραμμάτων
+Comment[es]=Editar esquemas eléctricos
+Comment[fr]=Éditer des schémas électriques.
+Comment[hr]=Uredi elektro sheme
+Comment[it]=Disegnare schemi elettrici
 Comment[ja]=電気回路図の編集。
+Comment[nl]=Bewerken bedradingsdiagrammen.
+Comment[pl]=Edycja schematów elektrycznych
+Comment[pt]=Criar esquemas eléctricos.
+Comment[ru]=Создание и редактирование электрических схем.
 Comment[sk]=Úprava elektrických schém.
 GenericName=Electrical diagram editor
-GenericName[de]=Schaltplaneditor
-GenericName[fr]=Éditeur de schémas électriques
 GenericName[ar]=مُحرّر مخططات كهربائية
-GenericName[es]=Editor de esquemas eléctricos
-GenericName[ru]=Редактор электрических схем
-GenericName[pt]=Editor de esquemas eléctricos.
-GenericName[cs]=Editor výkresů elektrických obvodů
-GenericName[pl]=Edytor schematów elektrycznych
-GenericName[it]=Programma per disegnare schemi elettrici
-GenericName[hr]=Editor elektro sheme
-GenericName[el]=Επεξεργαστής ηλεκτρικών διαγραμμάτων
-GenericName[nl]=Elektrische schema editor
 GenericName[be]=Elektrische schema editor
+GenericName[cs]=Editor výkresů elektrických obvodů
 GenericName[da]=Elektrisk diagram redigering
+GenericName[de]=Schaltplaneditor
+GenericName[el]=Επεξεργαστής ηλεκτρικών διαγραμμάτων
+GenericName[es]=Editor de esquemas eléctricos
+GenericName[fr]=Éditeur de schémas électriques
+GenericName[hr]=Editor elektro sheme
+GenericName[it]=Programma per disegnare schemi elettrici
 GenericName[ja]=電気回路図エディタ
+GenericName[nl]=Elektrische schema editor
+GenericName[pl]=Edytor schematów elektrycznych
+GenericName[pt]=Editor de esquemas eléctricos.
+GenericName[ru]=Редактор электрических схем
 GenericName[sk]=Editor elektrických schém

sources/editor/elementscene.cpp

@@ -478,10 +478,12 @@ const QDomDocument ElementScene::toXml(bool all_parts)
 		root.appendChild(element_info);
 	}
 
-	//complementary information about the element
+	//complementary information about the element, when available
-	QDomElement informations_element = xml_document.createElement("informations");
+	if (!(m_element_data.m_drawing_information.trimmed().isEmpty())) {
-	root.appendChild(informations_element);
+		QDomElement informations_element = xml_document.createElement("informations");
-	informations_element.appendChild(xml_document.createTextNode(m_element_data.m_drawing_information.trimmed()));
+		root.appendChild(informations_element);
+		informations_element.appendChild(xml_document.createTextNode(m_element_data.m_drawing_information.trimmed()));
+	}
 
 	QDomElement description = xml_document.createElement("description");
 

sources/elementspanelwidget.cpp

@@ -180,7 +180,7 @@ void ElementsPanelWidget::reloadAndFilter()
 }
 
 /**
-	* Emit the requestForProject signal with te selected project
+	* Emit the requestForProject signal with the selected project
 */
 void ElementsPanelWidget::activateProject()
 {

sources/qetgraphicsitem/conductor.cpp

@@ -1339,17 +1339,17 @@ void Conductor::calculateTextItemPosition()
 		relatedPotentialConductors(false).size() > 0)
 	{
 
-		Conductor *longuest_conductor = longuestConductorInPotential(this);
+		Conductor *longest_conductor = longestConductorInPotential(this);
 
-			//The longuest conductor isn't this conductor
+			//The longest conductor isn't this conductor
-			//we call calculateTextItemPosition of the longuest conductor
+			//we call calculateTextItemPosition of the longest conductor
-		if(longuest_conductor != this)
+		if(longest_conductor != this)
 		{
-			longuest_conductor -> calculateTextItemPosition();
+			longest_conductor -> calculateTextItemPosition();
 			return;
 		}
 
-			//At this point this conductor is the longuest conductor we hide all text of conductor_list
+			//At this point this conductor is the longest conductor we hide all text of conductor_list
 		foreach (Conductor *c, relatedPotentialConductors(false)) {
 					c -> textItem() -> setVisible(false);
 		}
@@ -2072,19 +2072,19 @@ QPointF Conductor::movePointIntoPolygon(const QPointF &point, const QPainterPath
 }
 
 /**
-	@brief longuestConductorInPotential
+	@brief longestConductorInPotential
 	@param conductor : a conductor in the potential to search
 	@param all_diagram : true -> search in the whole project, false -> search only in the diagram of conductor
-	@return the longuest conductor in the same potential of conductor
+	@return the longest conductor in the same potential of conductor
 */
-Conductor * longuestConductorInPotential(Conductor *conductor, bool all_diagram) {
+Conductor * longestConductorInPotential(Conductor *conductor, bool all_diagram) {
-	Conductor *longuest_conductor = conductor;
+	Conductor *longest_conductor = conductor;
-	//Search the longuest conductor
+	//Search the longest conductor
 	foreach (Conductor *c, conductor -> relatedPotentialConductors(all_diagram))
-		if (c -> length() > longuest_conductor -> length())
+		if (c -> length() > longest_conductor -> length())
-			longuest_conductor = c;
+			longest_conductor = c;
 
-	return longuest_conductor;
+	return longest_conductor;
 }
 
 /**

sources/qetgraphicsitem/conductor.h

@@ -232,7 +232,7 @@ class Conductor : public QGraphicsObject
 		static QPointF movePointIntoPolygon(const QPointF &, const QPainterPath &);
 };
 
-Conductor * longuestConductorInPotential (Conductor *conductor, bool all_diagram = false);
+Conductor * longestConductorInPotential (Conductor *conductor, bool all_diagram = false);
 QList <Conductor *> relatedConductors (const Conductor *conductor);
 
 

sources/qetgraphicsitem/terminal.cpp

@@ -314,7 +314,7 @@ QLineF Terminal::HelpLine() const
 
 	QLineF line(scene_dock , QPointF());
 
-		//Set te second point of line to the edge of diagram,
+		//Set the second point of line to the edge of diagram,
 		//according with the orientation of this terminal
 	switch (orientation())
 	{

sources/titleblock/templatecommands.cpp

@@ -1083,7 +1083,7 @@ void PasteTemplateCellsCommand::redo()
 }
 
 /**
-	@param cell Pointer to the cell impacted by te paste operation
+	@param cell Pointer to the cell impacted by the paste operation
 	@param new_cell_content Content pasted to the cell
 */
 void PasteTemplateCellsCommand::addPastedCell(TitleBlockCell *cell, const TitleBlockCell &new_cell_content) {
@@ -1091,7 +1091,7 @@ void PasteTemplateCellsCommand::addPastedCell(TitleBlockCell *cell, const TitleB
 }
 
 /**
-	@param cell Pointer to the cell impacted by te paste operation
+	@param cell Pointer to the cell impacted by the paste operation
 	@param former_cell_content Content of the cell before the paste operation
 */
 void PasteTemplateCellsCommand::addErasedCell(TitleBlockCell *cell, const TitleBlockCell &former_cell_content) {