kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-21 16:50:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add '%savedfilename' and '%savedfilepath' title block variables

Browse Source 
They should be updated after file save or save as dialog is confirmed,
before file is saved.


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5471 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2018-08-06 17:20:50 +00:00
parent 66a036ad2c
commit 92a4d0f88e
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sources/qetproject.cpp
View File

@@ -254,9 +254,11 @@ void QETProject::setFilePath(const QString &filepath) {
if (file_path_info.isWritable()) { if (file_path_info.isWritable()) {
setReadOnly(false); setReadOnly(false);
} }
//'%saveddate' and '%savedtime' title block variables should be updated after file save as dialog is confirmed, before file is saved. //title block variables should be updated after file save as dialog is confirmed, before file is saved.
project_properties_.addValue("saveddate", QDate::currentDate().toString("yyyy-MM-dd")); project_properties_.addValue("saveddate", QDate::currentDate().toString("yyyy-MM-dd"));
project_properties_.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm")); project_properties_.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm"));
project_properties_.addValue("savedfilename", QFileInfo(filePath()).baseName());
project_properties_.addValue("savedfilepath", filePath());
@@ -873,9 +875,12 @@ QETResult QETProject::write()
QString error_message; QString error_message;
if (!QET::writeXmlFile(xml_project, m_file_path, &error_message)) return(error_message); if (!QET::writeXmlFile(xml_project, m_file_path, &error_message)) return(error_message);
//'%saveddate' and '%savedtime' title block variables should be updated after file save dialog is confirmed, before file is saved. //title block variables should be updated after file save dialog is confirmed, before file is saved.
project_properties_.addValue("saveddate", QDate::currentDate().toString("yyyy-MM-dd")); project_properties_.addValue("saveddate", QDate::currentDate().toString("yyyy-MM-dd"));
project_properties_.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm")); project_properties_.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm"));
project_properties_.addValue("savedfilename", QFileInfo(filePath()).baseName());
project_properties_.addValue("savedfilepath", filePath());

2
sources/titleblock/templatecellwidget.cpp
View File

@@ -449,6 +449,8 @@ QString TitleBlockTemplateCellWidget::defaultVariablesString() const {
"<li>%{projectfilename} : nom du fichier</li>" "<li>%{projectfilename} : nom du fichier</li>"
"<li>%{saveddate} : date d'enregistrement du fichier</li>" "<li>%{saveddate} : date d'enregistrement du fichier</li>"
"<li>%{savedtime} : heure d'enregistrement du fichier</li>" "<li>%{savedtime} : heure d'enregistrement du fichier</li>"
"<li>%{savedfilename} : nom du fichier enregistré</li>"
"<li>%{savedfilepath} : chemin du fichier enregistré</li>"
"</ul>" "</ul>"
); );
return(def_var_string); return(def_var_string);