Merge 0a658d5d61 into a140c5ad39

sources/editor/ui/dynamictextfieldeditor.cpp

@@ -226,15 +226,9 @@ void DynamicTextFieldEditor::fillInfoComboBox()
 	else {
 		strl = QETInformation::elementInfoKeys();
 	}
-		//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));
+	for (int i=0; i<strl.size();++i) {
+		ui -> m_elmt_info_cb -> addItem(strl[i], QETInformation::translatedInfoKey(strl[i]));
+	}
 }
 
 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,7 +57,6 @@ 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/titleblockpropertieswidget.cpp

@@ -49,7 +49,7 @@ TitleBlockPropertiesWidget::TitleBlockPropertiesWidget(
 
 /**
 	@brief TitleBlockPropertiesWidget::TitleBlockPropertiesWidget
-	default constructor with template list
+	default constructor with tempalte list
 	@param tbt_collection template list
 	@param titleblock properties to edit
 	@param current_date if true, display the radio button "current date"