kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-09-29 14:14:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feat/database-from-document

Browse Source 
# Conflicts:
#	sources/qetproject.cpp
This commit is contained in:
ispyisail
2026-09-29 19:00:16 +13:00
parent b1abab1241 33a4ef5bad
commit 8fdff95732
19 changed files with 1071 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/qetproject.cpp
+3 -3
View File
@@ -580,7 +580,7 @@ void QETProject::setFilePath(const QString &filepath)
m_project_properties.addValue("saveddate-eu", QDate::currentDate().toString("dd-MM-yyyy"));
m_project_properties.addValue("saveddate-us", QDate::currentDate().toString("yyyy-MM-dd"));
m_project_properties.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm"));
m_project_properties.addValue("savedfilename", QFileInfo(filePath()).baseName());
m_project_properties.addValue("savedfilename", QFileInfo(filePath()).completeBaseName());
m_project_properties.addValue("savedfilepath", filePath());
@@ -1428,7 +1428,7 @@ QETResult QETProject::write()
m_project_properties.addValue("saveddate-us", QDate::currentDate().toString("yyyy-MM-dd"));
m_project_properties.addValue("saveddate-eu", QDate::currentDate().toString("dd-MM-yyyy"));
m_project_properties.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm"));
m_project_properties.addValue("savedfilename", QFileInfo(filePath()).baseName());
m_project_properties.addValue("savedfilename", QFileInfo(filePath()).completeBaseName());
m_project_properties.addValue("savedfilepath", filePath());
emit projectInformationsChanged(this);
@@ -2483,7 +2483,7 @@ DiagramContext QETProject::projectWideProperties()
DiagramContext project_wide_properties = m_project_properties;
project_wide_properties.addValue("projecttitle", title());
project_wide_properties.addValue("projectpath", filePath());
project_wide_properties.addValue("projectfilename", QFileInfo(filePath()).baseName());
project_wide_properties.addValue("projectfilename", QFileInfo(filePath()).completeBaseName());
return project_wide_properties;
}