mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-11 06:34:14 +02:00
Kellermorph
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.
65 lines
2.2 KiB
C++
65 lines
2.2 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/>.
|
|
*/
|
|
#ifndef PASTENUMBERINGIMPORT_H
|
|
#define PASTENUMBERINGIMPORT_H
|
|
|
|
#include "../elementautonumschemecommand.h"
|
|
#include "../../diagramcontent.h"
|
|
|
|
#include <QCoreApplication>
|
|
#include <QList>
|
|
#include <QUndoCommand>
|
|
|
|
class Diagram;
|
|
class QWidget;
|
|
|
|
/**
|
|
@brief The PasteNumberingImport class
|
|
Pastes elements copied from another project, which may follow element
|
|
numberings this project does not have.
|
|
|
|
Such an element would be left with a formula which names no numbering
|
|
here, and with a label nothing explains. So the user is asked, once
|
|
for all the numberings missing, whether to import them. Imported, they
|
|
number the pasted elements from their first number (a number of the other
|
|
project means nothing here); not imported, the elements are pasted
|
|
without a numbering.
|
|
|
|
The import and the paste are one undo step.
|
|
|
|
A paste which brings more than itself (the cable lines of the copy,
|
|
for instance, which are no part of a DiagramContent) hands those
|
|
commands over through @p extra: they are pushed inside the very
|
|
same macro, so one Ctrl+Z still takes the whole of it back.
|
|
*/
|
|
class PasteNumberingImport
|
|
{
|
|
Q_DECLARE_TR_FUNCTIONS(PasteNumberingImport)
|
|
|
|
public:
|
|
static void push(QWidget *parent,
|
|
Diagram *diagram,
|
|
const DiagramContent &content,
|
|
const QList<ElementAutoNumSchemeCommand::Scheme> &copied,
|
|
const QList<QUndoCommand *> &extra = QList<QUndoCommand *>());
|
|
|
|
static QList<ElementAutoNumSchemeCommand::Scheme> copiedBy(const QDomDocument &clipboard);
|
|
};
|
|
|
|
#endif // PASTENUMBERINGIMPORT_H
|