mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-08-13 18:14:13 +02:00
Merge branch 'master' into master-modernize-signal-slot
This commit is contained in:
@@ -26,6 +26,7 @@
|
||||
#include "../numerotationcontext.h"
|
||||
#include "../numerotationcontextcommands.h"
|
||||
#include "ui_autonumberingdockwidget.h"
|
||||
#include "../../undocommand/changetitleblockcommand.h"
|
||||
|
||||
#include <QComboBox>
|
||||
#include <QLineEdit>
|
||||
@@ -347,10 +348,17 @@ void AutoNumberingDockWidget::on_m_folio_cb_activated(int) {
|
||||
ip.folio = "%id/%total";
|
||||
m_project->setDefaultTitleBlockProperties(ip);
|
||||
}
|
||||
|
||||
if (m_project_view && m_project_view->currentDiagram()) {
|
||||
m_project_view->currentDiagram()->diagram()->border_and_titleblock.importTitleBlock(ip);
|
||||
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));
|
||||
emit(folioAutoNumChanged(current_autonum));
|
||||
refreshRow(AutoNumCategory::Folio);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user