mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-11 14:44:15 +02:00
955dfb3a73
Conflicts resolved in 24 files. Notable decisions: - ico/icon-themes.qrc: upstream's icon folder restructure kept; the 36 cable icon entries re-added under the new qet/qet-dark path scheme (XML valid, every referenced file exists). - Toolbar system: upstream's DiagramToolbarSettings now owns the toolbar filling. The cable tool is registered as diagrameditor.add_cable (generic group loop) and listed on the "diagram" toolbar right after the auto-break conductor action, separated by a divider, exactly like before the merge. - Paste: the cable lines of a copy are handed to PasteNumberingImport::push() as extra commands, so paste + cable lines + the numbering question stay ONE undo step on both paste paths (DiagramView::paste and DiagramEventAddPaste::commit). - PDF links: upstream's deterministic link sorting kept together with the cable cross-reference injector (injectLinkTo -> links list). - Element renumbering: upstream's ElementAutoNumSchemeCommand::renumber replaces the old formula-based body of QETProject::renumberElementsBySchemeTitle; the cable numbering rule API (cableAutoNum, axis priority, rule name) is kept in full. - Auto-numbering pages: upstream's scheme management kept, the Câbles tab added as index 4 (changeToCableTab), both entry points changeToCable() and changeToElement() kept side by side. - SelectAutonumW: dirty tracking and the contextEdited signal moved into upstream's insertPartRow() row API, so single-rule mode, the rule-removable button and "confirm without change leaves the project alone" keep working. - xrefpropertieswidget: upstream's offset clamping kept; the cable branch (Texte field, Police button, hidden display options) kept; the stack-overlapping checkbox is hidden for cables. Verified after the merge: build green (515/515, no errors), ctest 85/86 (only the pre-existing headless tst_menubarkeyboard failure), offscreen smoke exit 124.
117 lines
4.1 KiB
C++
117 lines
4.1 KiB
C++
/*
|
|
Copyright 2006-2026 The QElectroTech Team
|
|
This file is part of QElectroTech.
|
|
|
|
QElectroTech is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
QElectroTech is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#include "pastenumberingimport.h"
|
|
|
|
#include "../../diagram.h"
|
|
#include "../../diagramcommands.h"
|
|
#include "../../qetmessagebox.h"
|
|
#include "../../qetproject.h"
|
|
|
|
#include <QSettings>
|
|
|
|
/// @return the numberings a copy carries, which pasted elements follow
|
|
QList<ElementAutoNumSchemeCommand::Scheme> PasteNumberingImport::copiedBy(const QDomDocument &clipboard)
|
|
{
|
|
return ElementAutoNumSchemeCommand::copiedSchemes(clipboard.documentElement());
|
|
}
|
|
|
|
/**
|
|
@brief PasteNumberingImport::push
|
|
Push the paste of @p content on the undo stack of @p diagram, after
|
|
asking whether to import the numberings of @p copied which the pasted
|
|
elements follow and the project does not have.
|
|
@param parent : parent of the question
|
|
@param copied : the numberings the copy carries
|
|
@param extra : commands the copy brings beside the paste itself
|
|
(the cable lines of a fragment, for example); they are pushed inside
|
|
the same macro, so one Ctrl+Z undoes all of it at once.
|
|
*/
|
|
void PasteNumberingImport::push(QWidget *parent,
|
|
Diagram *diagram,
|
|
const DiagramContent &content,
|
|
const QList<ElementAutoNumSchemeCommand::Scheme> &copied,
|
|
const QList<QUndoCommand *> &extra)
|
|
{
|
|
QETProject *project = diagram->project();
|
|
auto *paste = new PasteDiagramCommand(diagram, content);
|
|
|
|
//The paste and the commands beside it are one step: only the
|
|
//macros really need more than the single push.
|
|
const auto push_all = [&]() {
|
|
if (extra.isEmpty()) {
|
|
diagram->undoStack().push(paste);
|
|
return;
|
|
}
|
|
diagram->undoStack().beginMacro(paste->text());
|
|
diagram->undoStack().push(paste);
|
|
for (QUndoCommand *cmd : extra) {
|
|
diagram->undoStack().push(cmd);
|
|
}
|
|
diagram->undoStack().endMacro();
|
|
};
|
|
|
|
QList<ElementAutoNumSchemeCommand::Scheme> missing;
|
|
if (project && !copied.isEmpty()
|
|
&& QSettings().value("diagramcommands/autonumber-pasted-elements", true).toBool()) {
|
|
missing = ElementAutoNumSchemeCommand::missingForPaste(project, copied, content.m_elements);
|
|
}
|
|
if (missing.isEmpty()) {
|
|
push_all();
|
|
return;
|
|
}
|
|
|
|
QStringList names;
|
|
for (const auto &scheme : std::as_const(missing)) {
|
|
names << QStringLiteral("« %1 »").arg(scheme.title);
|
|
}
|
|
const auto answer = QET::QetMessageBox::question(
|
|
parent,
|
|
tr("Numérotation absente de ce projet"),
|
|
tr("Les éléments collés suivent %n numérotation(s) qui n'existe(nt) pas dans ce projet : %1.\n\n"
|
|
"Les importer ? Les éléments recevront alors les prochains numéros, à partir de 1. "
|
|
"Sinon ils seront collés sans numérotation.", "", static_cast<int>(missing.size()))
|
|
.arg(names.join(QStringLiteral(", "))),
|
|
QMessageBox::Yes | QMessageBox::No,
|
|
QMessageBox::Yes);
|
|
if (answer != QMessageBox::Yes) {
|
|
push_all();
|
|
return;
|
|
}
|
|
|
|
diagram->undoStack().beginMacro(paste->text());
|
|
for (const auto &scheme : std::as_const(missing))
|
|
{
|
|
//Under its own name, or one which is free here
|
|
QString title = scheme.title;
|
|
for (int n = 2 ; !project->elementAutoNumNameClash(title).isEmpty() ; ++n) {
|
|
title = QStringLiteral("%1 (%2)").arg(scheme.title).arg(n);
|
|
}
|
|
if (auto *cmd = ElementAutoNumSchemeCommand::create(
|
|
project, title,
|
|
ElementAutoNumSchemeCommand::resetForRenumber(scheme.context),
|
|
scheme.id, false)) {
|
|
diagram->undoStack().push(cmd);
|
|
}
|
|
}
|
|
diagram->undoStack().push(paste);
|
|
for (QUndoCommand *cmd : extra) {
|
|
diagram->undoStack().push(cmd);
|
|
}
|
|
diagram->undoStack().endMacro();
|
|
}
|