Skip to content

MapEditorController: Paste at original location #2402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

MapEditorController: Paste at original location #2402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 27 additions & 16 deletions src/gui/map/map_editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,8 +988,14 @@ void MapEditorController::createActions()
cut_act->setMenuRole(QAction::TextHeuristicRole);
copy_act = newAction("copy", tr("C&opy"), this, SLOT(copy()), "copy.png", QString{}, "edit_menu.html");
copy_act->setMenuRole(QAction::TextHeuristicRole);
paste_act = newAction("paste", tr("&Paste"), this, SLOT(paste()), "paste", QString{}, "edit_menu.html");
auto* paste_act_mapper = new QSignalMapper(this);
connect(paste_act_mapper, QOverload<int>::of(&QSignalMapper::mapped), this, QOverload<int>::of(&MapEditorController::paste));
paste_act = newAction("paste", tr("&Paste"), paste_act_mapper, SLOT(map()), "paste", QString{}, "edit_menu.html");
paste_act->setMenuRole(QAction::TextHeuristicRole);
paste_act_mapper->setMapping(paste_act, 1);
paste_original_act = newAction("paste-original", tr("Paste at original location"), paste_act_mapper, SLOT(map()), nullptr, QString{}, "edit_menu.html");
paste_original_act->setMenuRole(QAction::TextHeuristicRole);
paste_act_mapper->setMapping(paste_original_act, 0);
delete_act = newAction("delete", tr("Delete"), this, SLOT(deleteClicked()), "delete.png", QString{}, "toolbars.html#delete");
select_all_act = newAction("select-all", tr("Select all"), this, SLOT(selectAll()), nullptr, QString{}, "edit_menu.html");
select_nothing_act = newAction("select-nothing", tr("Select nothing"), this, SLOT(selectNothing()), nullptr, QString{}, "edit_menu.html");
Expand Down Expand Up @@ -1170,6 +1176,7 @@ void MapEditorController::createMenuAndToolbars()
edit_menu->addAction(cut_act);
edit_menu->addAction(copy_act);
edit_menu->addAction(paste_act);
edit_menu->addAction(paste_original_act);
edit_menu->addAction(delete_act);
edit_menu->addSeparator();
edit_menu->addAction(select_all_act);
Expand Down Expand Up @@ -1957,7 +1964,7 @@ void MapEditorController::copy()
}


void MapEditorController::paste()
void MapEditorController::paste(int paste_at_center)
{
if (editing_in_progress)
return;
Expand All @@ -1980,14 +1987,17 @@ void MapEditorController::paste()
return;
}

// Move objects in paste_map so their bounding box center is at this map's viewport center.
// This makes the pasted objects appear at the center of the viewport.
QRectF paste_extent = paste_map.calculateExtent(true, false, nullptr);
auto offset = main_view->center() - paste_extent.center();

MapPart* part = paste_map.getCurrentPart();
for (int i = 0; i < part->getNumObjects(); ++i)
part->getObject(i)->move(offset);
if (paste_at_center)
{
// Move objects in paste_map so their bounding box center is at this map's viewport center.
// This makes the pasted objects appear at the center of the viewport.
QRectF paste_extent = paste_map.calculateExtent(true, false, nullptr);
auto offset = main_view->center() - paste_extent.center();

MapPart* part = paste_map.getCurrentPart();
for (int i = 0; i < part->getNumObjects(); ++i)
part->getObject(i)->move(offset);
}

// Import pasted map. Do not blindly import all colors.
importMap(paste_map, Map::MinimalObjectImport, window);
Expand Down Expand Up @@ -2704,13 +2714,14 @@ void MapEditorController::clipboardChanged(QClipboard::Mode mode)

void MapEditorController::updatePasteAvailability()
{
const bool paste_available = QApplication::clipboard()->mimeData()
&& QApplication::clipboard()->mimeData()->hasFormat(MimeType::OpenOrienteeringObjects())
&& !editing_in_progress;

if (paste_act)
{
paste_act->setEnabled(
QApplication::clipboard()->mimeData()
&& QApplication::clipboard()->mimeData()->hasFormat(MimeType::OpenOrienteeringObjects())
&& !editing_in_progress);
}
paste_act->setEnabled(paste_available);
if (paste_original_act)
paste_original_act->setEnabled(paste_available);
}

void MapEditorController::showWholeMap()
Expand Down
5 changes: 3 additions & 2 deletions src/gui/map/map_editor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 2012, 2013, 2014 Thomas Schöps
* Copyright 2013-2024 Kai Pastor
* Copyright 2013-2025 Kai Pastor
*
* This file is part of OpenOrienteering.
*
Expand Down Expand Up @@ -289,7 +289,7 @@ public slots:
/** Copies the selected object(s). */
void copy();
/** Pastes the object(s) from the clipboard. */
void paste();
void paste(int paste_at_center);
/** Empties the undo / redo history to save space. */
void clearUndoRedoHistory();

Expand Down Expand Up @@ -715,6 +715,7 @@ protected slots:
QAction* cut_act = {};
QAction* copy_act = {};
QAction* paste_act = {};
QAction* paste_original_act = {};
QAction* delete_act = {};
QAction* select_all_act = {};
QAction* select_nothing_act = {};
Expand Down