Revert "ElementEditor elmt_info_cb sorting changed"

Merge pull request #316 from plc-user/master
Fix typo and some whitespace
2026-06-13 08:13: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
15 changed files with 32 additions and 29 deletions
@@ -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})
@@ -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,
@@ -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]
@@ -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);
@@ -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
@@ -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
@@ -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);
@@ -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
Laurent Trinques	a140c5ad39	Update CMakeLists.txt Publish Edge Snap / publish_amd64 (push) Failing after 15s Details	2024-12-15 15:05:23 +01:00
Laurent Trinques	4894284520	Fix segfault due to calling method of uninitialized object, thanks ladmanj https://github.com/qelectrotech/qelectrotech-source-mirror/issues/311	2024-12-15 14:41:34 +01:00
Laurent Trinques	efc8745bc7	Update packaging_script_AppImage.sh	2024-12-15 09:35:26 +01:00
Laurent Trinques	406af16e94	Update org.qelectrotech.QElectroTech.json	2024-12-15 09:32:16 +01:00
Laurent Trinques	e3e48d3966	Fix snapcraft.yaml Publish Edge Snap / publish_amd64 (push) Failing after 14s Details	2024-12-14 16:09:07 +01:00
Laurent Trinques	0e646aed0b	Update translations_stat.pl Publish Edge Snap / publish_amd64 (push) Failing after 16s Details	2024-12-14 14:25:35 +01:00
Laurent Trinques	52d56c18a2	Try to fix icon on Wayland	2024-12-14 13:31:42 +01:00
Laurent Trinques	d3f132adc6	Try to fix icon on Wayland	2024-12-14 13:28:17 +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
Laurent Trinques	64bb2308d8	git submodule update --remote elements Publish Edge Snap / publish_amd64 (push) Failing after 15s Details	2024-12-07 17:05:23 +01:00