mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-11 14:44:15 +02:00
69eb071f45
Upstream moved 56 commits ahead of the last merge. Six files conflicted,
all of them files where upstream's French -> English tr() translation wave
touched lines we had also touched with the cable feature. Resolution rule
applied everywhere: take upstream's English source strings, keep our cable
additions.
Resolved:
- sources/ui/xrefpropertieswidget.ui : kept our structure (m_labels_gb
pulled out of the display group, m_slave_row, the m_font_pb "Police..."
button of the cable cross-reference) and mechanically applied upstream's
20 English string replacements on top of it.
- sources/ui/xrefpropertieswidget.cpp : our version plus upstream's 7
translated combo entries; the tr("Cable") item we add for the cable
cross-reference type stays.
- sources/autoNum/ui/numparteditorw.cpp : upstream's English part names
("number format 1", "Sheet no.", "Plant", "Location", ...) for the
number-format list, with our comment explaining why type 3 (cable) takes
the conductor kinds of variable.
- sources/ui/configpage/configpages.cpp : upstream's English tab titles
(Conductors / Elements / Sheets) plus our Cables tab.
- sources/ui/configpage/projectconfigpages.cpp : upstream's "Sheets" tab
title plus our Cables tab block (single-rule SelectAutonumW(3)).
- sources/qetdiagrameditor.cpp : union of both sides - upstream's new
"Add a generic device" action (icon, status tip, data id) and its
English menu names ("File"/"Edit"/"Project"/"Display"), together with our
cable action, the Numbering and Lists menus, the cable list actions and
the CSV export in the Project menu.
Kept French: our own cable tr() source strings stay French for now. That
is the smaller change and the translation pass can follow separately.
Verified: full build 1065/1065, ctest 91/92 (only the pre-existing
headless tst_menubarkeyboard fails: no window manager, so Alt+F and F10
cannot open a menu bar), smoke start exit 124, no conflict marker left in
the tree.
118 lines
4.1 KiB
C++
118 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("Numbering missing from this project"),
|
|
tr("The pasted elements follow %n numberings that do not exist in this project: %1.\n"
|
|
"\n"
|
|
"Import them? The elements will then receive the next numbers, starting from 1. Otherwise "
|
|
"they will be pasted without numbering.", "", 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();
|
|
}
|