Revert "ElementEditor elmt_info_cb sorting changed"

Fix typo and some whitespace

CMakeLists.txt

@@ -146,7 +146,7 @@ install(DIRECTORY elements DESTINATION share/qelectrotech)
 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/qelectrotech.desktop DESTINATION share/applications)
+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})
 install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})

build-aux/flatpak/org.qelectrotech.QElectroTech.json

@@ -5,7 +5,7 @@
   "runtime-version": "5.15-23.08",
   "sdk": "org.kde.Sdk",
   "command": "qelectrotech",
-  "rename-desktop-file": "qelectrotech.desktop",
+  "rename-desktop-file": "org.qelectrotech.qelectrotech.desktop",
   "rename-appdata-file": "qelectrotech.appdata.xml",
   "rename-icon": "qelectrotech",
   "copy-icon": true,

build-aux/snap/snapcraft.yaml

@@ -93,7 +93,7 @@ parts:
       craftctl default
       # patch desktop file with correct icon path
       SED_CMD="sed -i -E s|^Icon=(.*)|Icon=\${SNAP}/usr/local/share/icons/hicolor/128x128/apps/\1.png|g" 
-      $SED_CMD usr/local/share/applications/qelectrotech.desktop
+      $SED_CMD usr/local/share/applications/org.qelectrotech.qelectrotech.desktop
 
   cleanup:
     after: [qelectrotech, qet-tb-generator]

misc/translations_stat.pl

@@ -33,7 +33,7 @@ my $no = '[no]';
 my $todo = 'TODO';
 
 our $default_language = 'fr';
-our @misc_desktop_files = qw(misc/qelectrotech.desktop);
+our @misc_desktop_files = qw(misc/org.qelectrotech.qelectrotech.desktop);
 our @misc_xml_files     = qw(misc/qelectrotech.xml);
 our @readme_files       = qw(CREDIT README INSTALL ELEMENTS.LICENSE build-aux/linux/fedora/README.elements);
 our @ordered_languages  = qw(fr en es pt cs pl ca de it ar sl hr el nl be ru ro da pt_BR hu sr tr nb ja mn uk zh);

packaging_script_AppImage.sh

@@ -39,9 +39,9 @@ rm -Rf qelectrotech/usr/share/{elements,examples,titleblocks,lang,man,doc}
 cp ../build/qelectrotech qelectrotech/usr/bin/
 cp -r ../{elements,examples,titleblocks,lang,man} qelectrotech/usr/share/
 
-./linuxdeployqt-continuous-x86_64.AppImage qelectrotech/usr/share/qelectrotech.desktop  -appimage -bundle-non-qt-libs -verbose=1 -extra-plugins=iconengines
+./linuxdeployqt-continuous-x86_64.AppImage qelectrotech/usr/share/org.qelectrotech.qelectrotech.desktop  -appimage -bundle-non-qt-libs -verbose=1 -extra-plugins=iconengines
 rm qelectrotech/AppRun
-sed -i 's/'"QElectroTech_*.*/QElectroTech_$tagName-r$HEAD"'/' qelectrotech/qelectrotech.desktop
+sed -i 's/'"QElectroTech_*.*/QElectroTech_$tagName-r$HEAD"'/' qelectrotech/org.qelectrotech.qelectrotech.desktop
 cp AppRun qelectrotech/
 rm QElectroTech_*.AppImage
 

qelectrotech.pro

@@ -281,7 +281,7 @@ mime_package.path  = $$join(INSTALL_PREFIX,,,$${QET_MIME_PACKAGE_PATH})
 mime_package.files = misc/qelectrotech.xml
 
 desktop.path       = $$join(INSTALL_PREFIX,,,$${QET_DESKTOP_PATH})
-desktop.files      = misc/qelectrotech.desktop
+desktop.files      = misc/org.qelectrotech.qelectrotech.desktop
 
 appdata.path       = $$join(INSTALL_PREFIX,,,$${QET_APPDATA_PATH})
 appdata.files      = misc/qelectrotech.appdata.xml

sources/ElementsCollection/elementcollectionhandler.cpp

@@ -399,7 +399,7 @@ ElementsLocation ElementCollectionHandler::createDir(ElementsLocation &parent, c
 	@brief ElementCollectionHandler::importFromProject
 	Import the element represented by location to the embedded collection
 	of project at the same path.
-	location must represente an element owned by a project embedded collection
+	location must represent an element owned by a project embedded collection
 	@param project : project where copy the element
 	@param location : location to copy
 	@return true if import with success

sources/ElementsCollection/elementscollectionwidget.cpp

@@ -529,7 +529,7 @@ void ElementsCollectionWidget::newElement()
 	elmt_wizard.exec();
 
 	foreach (QETElementEditor *element_editor,
-		 QETApp::instance()->elementEditors())
+			 QETApp::instance()->elementEditors())
 		connect(element_editor,
 			&QETElementEditor::saveToLocation,
 			this,
@@ -713,7 +713,7 @@ void ElementsCollectionWidget::locationWasSaved(
 		const ElementsLocation& location)
 {
 	//Because this method update an item in the model, location must
-	//represente an existing element (in file system of project)
+	//represent an existing element (in file system of project)
 	if (!location.exist())
 		return;
 

sources/ElementsCollection/elementslocation.cpp

@@ -591,7 +591,7 @@ bool ElementsLocation::isWritable() const
 /**
 	@brief ElementsLocation::projectCollection
 	@return
-	If this location represente a item in an embedded project collection,
+	If this location represents an item in an embedded project collection,
 	return this collection else return nullptr.
 */
 XmlElementCollection *ElementsLocation::projectCollection() const

sources/qetdiagrameditor.cpp

@@ -1558,7 +1558,9 @@ void QETDiagramEditor::slot_updateActions()
 	m_csv_export                  -> setEnabled(editable_project);
 	m_project_export_conductor_num-> setEnabled(opened_project);
 	m_terminal_strip_dialog       -> setEnabled(editable_project);
+#ifdef QET_EXPORT_PROJECT_DB
 	m_export_project_db           -> setEnabled(editable_project);
+#endif
 	m_project_terminalBloc        -> setEnabled(editable_project);
 
 

sources/qetinformation.h

@@ -22,7 +22,7 @@
 #include <QHash>
 
 /**
- * Inside this namespace you will fin all information used in QElectrotech for
+ * Inside this namespace you will find all information used in QElectrotech for
  * element, conductor and diagram.
  * Each information have 3 values :
  * #1 the info key = the key of an information as a QString used in the code (example : label)

sources/qetproject.cpp

@@ -510,7 +510,7 @@ void QETProject::setDefaultTitleBlockProperties(const TitleBlockProperties &titl
 				collection = QETApp::commonTitleBlockTemplatesCollection();
 				break;
 			case QET::Company :
-			//	collection = QETApp::companyTitleBlockTemplatesCollection();
+				collection = QETApp::companyTitleBlockTemplatesCollection();
 				break;
 			case QET::Custom :
 				collection = QETApp::customTitleBlockTemplatesCollection();

sources/ui/configpage/configpages.cpp

@@ -57,6 +57,7 @@ NewDiagramPage::NewDiagramPage(QETProject *project,
 	// default titleblock properties
 	QList <TitleBlockTemplatesCollection *> c;
 	c << QETApp::commonTitleBlockTemplatesCollection()
+	  << QETApp::companyTitleBlockTemplatesCollection()
 	  << QETApp::customTitleBlockTemplatesCollection();
 	if (m_project) c << m_project->embeddedTitleBlockTemplatesCollection();
 	ipw = new TitleBlockPropertiesWidget(

sources/ui/configpage/configpages.h

@@ -66,9 +66,9 @@ public slots:
 	QETProject                 *m_project; ///< Project to edit properties
 	BorderPropertiesWidget     *bpw;       ///< Widget to edit default diagram dimensions
 	TitleBlockPropertiesWidget *ipw;       ///< Widget to edit default title block properties
-	ConductorPropertiesWidget  *m_cpw;       ///< Widget to edit default conductor properties
+	ConductorPropertiesWidget  *m_cpw;     ///< Widget to edit default conductor properties
 	ReportPropertieWidget      *rpw;       ///< Widget to edit default report label
-	XRefPropertiesWidget       *xrefpw;	   ///< Widget to edit default xref properties
+	XRefPropertiesWidget       *xrefpw;    ///< Widget to edit default xref properties
 	TitleBlockProperties       savedTbp;   ///< Used to save current TBP and retrieve later
 
 };

sources/ui/diagrampropertiesdialog.cpp

@@ -57,7 +57,7 @@ DiagramPropertiesDialog::DiagramPropertiesDialog(Diagram *diagram, QWidget *pare
 	TitleBlockPropertiesWidget  *titleblock_infos;
 
 	if (QETProject *parent_project = diagram -> project())
-		titleblock_infos  = new TitleBlockPropertiesWidget(parent_project -> embeddedTitleBlockTemplatesCollection(), titleblock, false, diagram->project(),  this);
+		titleblock_infos = new TitleBlockPropertiesWidget(parent_project -> embeddedTitleBlockTemplatesCollection(), titleblock, false, diagram->project(), this);
 	else
 		titleblock_infos = new TitleBlockPropertiesWidget(titleblock, false, diagram->project(), this);
 

sources/ui/dynamicelementtextmodel.cpp

@@ -970,7 +970,7 @@ QModelIndex DynamicElementTextModel::indexFromGroup(
 /**
 	@brief DynamicElementTextModel::indexIsText
 	@param index
-	@return True if index represente a text, both for the column 0 and 1.
+	@return True if index represents a text, both for the column 0 and 1.
 	Return false if index is a child of an index associated to a text.
 */
 bool DynamicElementTextModel::indexIsText(const QModelIndex &index) const
@@ -1000,7 +1000,7 @@ bool DynamicElementTextModel::indexIsText(const QModelIndex &index) const
 /**
 	@brief DynamicElementTextModel::indexIsGroup
 	@param index
-	@return True if index represente a group, both for the column 0 and 1.
+	@return True if index represents a group, both for the column 0 and 1.
 	Return false if index is a child of an index associated to a group.
 */
 bool DynamicElementTextModel::indexIsGroup(const QModelIndex &index) const

sources/ui/titleblockpropertieswidget.cpp

@@ -49,7 +49,7 @@ TitleBlockPropertiesWidget::TitleBlockPropertiesWidget(
 
 /**
 	@brief TitleBlockPropertiesWidget::TitleBlockPropertiesWidget
-	default constructor with tempalte list
+	default constructor with template list
 	@param tbt_collection template list
 	@param titleblock properties to edit
 	@param current_date if true, display the radio button "current date"
@@ -113,17 +113,17 @@ TitleBlockPropertiesWidget::~TitleBlockPropertiesWidget()
 */
 void TitleBlockPropertiesWidget::setProperties(
 		const TitleBlockProperties &properties) {
-	ui -> m_title_le  -> setText (properties.title);
+	ui -> m_title_le      -> setText (properties.title);
-	ui -> m_author_le -> setText (properties.author);
+	ui -> m_author_le     -> setText (properties.author);
-	ui -> m_file_le   -> setText (properties.filename);
+	ui -> m_file_le       -> setText (properties.filename);
-	ui -> m_plant      -> setText (properties.plant);
+	ui -> m_plant         -> setText (properties.plant);
-	ui -> m_loc   -> setText (properties.locmach);
+	ui -> m_loc           -> setText (properties.locmach);
-	ui -> m_indice    -> setText (properties.indexrev);
+	ui -> m_indice        -> setText (properties.indexrev);
-	ui -> m_folio_le  -> setText (properties.folio);
+	ui -> m_folio_le      -> setText (properties.folio);
 	ui -> m_display_at_cb -> setCurrentIndex(properties.display_at == Qt::BottomEdge ? 0 : 1);
 	ui->auto_page_cb->setCurrentText(properties.auto_page_num);
 
-	//About date	
+	//About date
 	ui -> m_date_now_pb -> setDisabled(true);
 	ui -> m_date_edit   -> setDisabled(true);
 	ui -> m_date_edit   -> setDate(QDate::currentDate());
@@ -172,13 +172,13 @@ void TitleBlockPropertiesWidget::setProperties(
 TitleBlockProperties TitleBlockPropertiesWidget::properties() const
 {
 	TitleBlockProperties prop;
-	prop.title    = ui -> m_title_le  -> text();
+	prop.title      = ui -> m_title_le      -> text();
-	prop.author   = ui -> m_author_le -> text();
+	prop.author     = ui -> m_author_le     -> text();
-	prop.filename = ui -> m_file_le   -> text();
+	prop.filename   = ui -> m_file_le       -> text();
-	prop.plant  = ui -> m_plant      -> text();
+	prop.plant      = ui -> m_plant         -> text();
-	prop.locmach  = ui -> m_loc   -> text();
+	prop.locmach    = ui -> m_loc           -> text();
-	prop.indexrev = ui -> m_indice    -> text();
+	prop.indexrev   = ui -> m_indice        -> text();
-	prop.folio    = ui -> m_folio_le  -> text();
+	prop.folio      = ui -> m_folio_le      -> text();
 	prop.display_at = ui -> m_display_at_cb -> currentIndex() == 0 ? Qt::BottomEdge : Qt::RightEdge;
 
 	if (ui->m_no_date_rb->isChecked()) {
@@ -218,7 +218,7 @@ TitleBlockProperties TitleBlockPropertiesWidget::propertiesAutoNum(
 	prop.title    = ui -> m_title_le  -> text();
 	prop.author   = ui -> m_author_le -> text();
 	prop.filename = ui -> m_file_le   -> text();
-	prop.plant    = ui -> m_plant      -> text();
+	prop.plant    = ui -> m_plant     -> text();
 	prop.locmach  = ui -> m_loc       -> text();
 	prop.indexrev = ui -> m_indice    -> text();
 	prop.folio    = "%autonum";