Revert "ElementEditor elmt_info_cb sorting changed"

Merge pull request #316 from plc-user/master
Fix typo and some whitespace
2026-06-28 12:34:14 +02:00 · 2024-12-21 12:59:43 +01:00 · 2024-12-19 16:22:45 +01:00 · 2024-12-19 10:52:13 +01:00 · 2024-12-19 10:41:58 +01:00 · 2024-12-19 09:58:37 +01:00
6 changed files with 22 additions and 21 deletions
@@ -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();
@@ -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(
@@ -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"
Author	SHA1	Message	Date
Laurent Trinques	34cc26a325	Revert "ElementEditor elmt_info_cb sorting changed"	2024-12-21 12:59:43 +01:00
Laurent Trinques	ba14c6112e	Merge pull request #316 from plc-user/master Fix typo and some whitespace	2024-12-19 16:22:45 +01:00
Laurent Trinques	cb8256bd48	Add de binary translation, thanks ChuckNr11 for update translation	2024-12-19 10:52:13 +01:00
Laurent Trinques	3dd512b587	Merge pull request #314 from ChuckNr11/master ElementEditor elmt_info_cb sorting changed	2024-12-19 10:41:58 +01:00
Laurent Trinques	31c0267cd5	Merge pull request #315 from plc-user/master Fix missing company-titleblocks in properties-dialog	2024-12-19 09:58:37 +01:00
plc-user	88b2955b00	Fix typo and some whitespace	2024-12-18 16:48:11 +01:00
plc-user	46378ca2a7	Fix missing company-titleblocks in properties-dialog	2024-12-18 15:18:34 +01:00
Achim	c7481011e8	german language file adapted	2024-12-16 16:01:37 +01:00
Achim	15d9708c46	a few small corrections	2024-12-16 16:00:50 +01:00
Achim	3b32daf15d	ComboBox change sorting alphabetical sorting in the ComboBox changed according to the order in the elementInfoKeys list	2024-12-16 15:55:16 +01:00
ChuckNr11	0a658d5d61	Merge branch 'qelectrotech:master' into master	2024-12-15 22:17:14 +01:00
Achim	7b50f10749	ElementEditor elmt_info_cb sorting changed alphabetical sorting in the ComboBox changed according to the order in the elementInfoKeys list	2024-12-08 19:36:22 +01:00