Merge branch 'master' into master-fix-slot

This commit is contained in:
Andre Rummler
2026-08-08 15:16:48 +02:00
parent 3eafe840f1
commit bfee5b1cdb
8 changed files with 67 additions and 13 deletions
+12 -1
View File
@@ -26,6 +26,7 @@
#include "../numerotationcontext.h"
#include "../numerotationcontextcommands.h"
#include "ui_autonumberingdockwidget.h"
#include "../../undocommand/changetitleblockcommand.h"
#include <QComboBox>
#include <QLineEdit>
@@ -371,7 +372,17 @@ void AutoNumberingDockWidget::on_m_folio_cb_activated(int) {
ip.folio = "%id/%total";
m_project->setDefaultTitleBlockProperties(ip);
}
emit(folioAutoNumChanged(current_autonum));
if (m_project_view && m_project_view->currentDiagram()) {
Diagram *diagram = m_project_view->currentDiagram()->diagram();
TitleBlockProperties old_properties = diagram->border_and_titleblock.exportTitleBlock();
TitleBlockProperties new_properties = old_properties;
new_properties.auto_page_num = ip.auto_page_num;
new_properties.folio = ip.folio;
if (new_properties != old_properties)
diagram->undoStack().push(new ChangeTitleBlockCommand(diagram, old_properties, new_properties));
}
emit(folioAutoNumChanged(current_autonum));
refreshRow(AutoNumCategory::Folio);
}