Revert "ElementEditor elmt_info_cb sorting changed"

Fix typo and some whitespace

sources/editor/ui/dynamictextfieldeditor.cpp

@@ -226,9 +226,15 @@ void DynamicTextFieldEditor::fillInfoComboBox()
 	else {
 		strl = QETInformation::elementInfoKeys();
 	}
-	for (int i=0; i<strl.size();++i) {
-		ui -> m_elmt_info_cb -> addItem(strl[i], QETInformation::translatedInfoKey(strl[i]));
-	}
+		//We use a QMap because the keys of the map are sorted, then no matter the current local,
+		//the value of the combo box are always alphabetically sorted
+	QMap <QString, QString> info_map;
+	for(const QString& str : strl)
+		info_map.insert(QETInformation::translatedInfoKey(str), str);
+
+
+	for (const QString& key : info_map.keys())
+		ui -> m_elmt_info_cb -> addItem(key, info_map.value(key));
 }
 
 void DynamicTextFieldEditor::on_m_x_sb_editingFinished()

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/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_author_le -> setText (properties.author);
-	ui -> m_file_le   -> setText (properties.filename);
-	ui -> m_plant      -> setText (properties.plant);
-	ui -> m_loc   -> setText (properties.locmach);
-	ui -> m_indice    -> setText (properties.indexrev);
-	ui -> m_folio_le  -> setText (properties.folio);
+	ui -> m_title_le      -> setText (properties.title);
+	ui -> m_author_le     -> setText (properties.author);
+	ui -> m_file_le       -> setText (properties.filename);
+	ui -> m_plant         -> setText (properties.plant);
+	ui -> m_loc           -> setText (properties.locmach);
+	ui -> m_indice        -> setText (properties.indexrev);
+	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.author   = ui -> m_author_le -> text();
-	prop.filename = ui -> m_file_le   -> text();
-	prop.plant  = ui -> m_plant      -> text();
-	prop.locmach  = ui -> m_loc   -> text();
-	prop.indexrev = ui -> m_indice    -> text();
-	prop.folio    = ui -> m_folio_le  -> text();
+	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.locmach    = ui -> m_loc           -> text();
+	prop.indexrev   = ui -> m_indice        -> 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";