Merge 7b50f10749 into 64bb2308d8

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/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications)
+install(FILES misc/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": "org.qelectrotech.qelectrotech.desktop",
+  "rename-desktop-file": "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/org.qelectrotech.qelectrotech.desktop
+      $SED_CMD usr/local/share/applications/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/org.qelectrotech.qelectrotech.desktop);
+our @misc_desktop_files = qw(misc/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/org.qelectrotech.qelectrotech.desktop  -appimage -bundle-non-qt-libs -verbose=1 -extra-plugins=iconengines
+./linuxdeployqt-continuous-x86_64.AppImage qelectrotech/usr/share/qelectrotech.desktop  -appimage -bundle-non-qt-libs -verbose=1 -extra-plugins=iconengines
 rm qelectrotech/AppRun
-sed -i 's/'"QElectroTech_*.*/QElectroTech_$tagName-r$HEAD"'/' qelectrotech/org.qelectrotech.qelectrotech.desktop
+sed -i 's/'"QElectroTech_*.*/QElectroTech_$tagName-r$HEAD"'/' 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/org.qelectrotech.qelectrotech.desktop
+desktop.files      = misc/qelectrotech.desktop
 
 appdata.path       = $$join(INSTALL_PREFIX,,,$${QET_APPDATA_PATH})
 appdata.files      = misc/qelectrotech.appdata.xml

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,
+	for (int i=0; i<strl.size();++i) {
-		//the value of the combo box are always alphabetically sorted
+		ui -> m_elmt_info_cb -> addItem(strl[i], QETInformation::translatedInfoKey(strl[i]));
-	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/qetdiagrameditor.cpp

@@ -1558,9 +1558,7 @@ 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/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"