|
158 | 158 | #include "tools/edit_line_tool.h" |
159 | 159 | #include "tools/fill_tool.h" |
160 | 160 | #include "tools/pan_tool.h" |
| 161 | +#include "tools/move_parallel_tool.h" |
161 | 162 | #include "tools/rotate_pattern_tool.h" |
162 | 163 | #include "tools/rotate_tool.h" |
163 | 164 | #include "tools/scale_tool.h" |
@@ -936,6 +937,7 @@ void MapEditorController::assignKeyboardShortcuts() |
936 | 937 | findAction("scaleobjects")->setShortcut(QKeySequence(tr("Z"))); |
937 | 938 | findAction("cutobject")->setShortcut(QKeySequence(tr("K"))); |
938 | 939 | findAction("cuthole")->setShortcut(QKeySequence(tr("H"))); |
| 940 | + findAction("moveparallel")->setShortcut(QKeySequence(tr("Ctrl+Shift+M"))); |
939 | 941 | findAction("measure")->setShortcut(QKeySequence(tr("M"))); |
940 | 942 | findAction("booleanunion")->setShortcut(QKeySequence(tr("U"))); |
941 | 943 | findAction("converttocurves")->setShortcut(QKeySequence(tr("N"))); |
@@ -1055,6 +1057,7 @@ void MapEditorController::createActions() |
1055 | 1057 | cut_hole_menu->addAction(cut_hole_circle_act); |
1056 | 1058 | cut_hole_menu->addAction(cut_hole_rectangle_act); |
1057 | 1059 |
|
| 1060 | + move_parallel_act = newToolAction("moveparallel", tr("Move parallel"), this, SLOT(moveParallelClicked()), "tool-move-parallel.png", QString{}, "toolbars.html#tool_move_parallel"); |
1058 | 1061 | rotate_act = newToolAction("rotateobjects", tr("Rotate objects"), this, SLOT(rotateClicked()), "tool-rotate.png", QString{}, "toolbars.html#rotate"); |
1059 | 1062 | rotate_pattern_act = newToolAction("rotatepatterns", tr("Rotate pattern"), this, SLOT(rotatePatternClicked()), "tool-rotate-pattern.png", QString{}, "toolbars.html#tool_rotate_pattern"); |
1060 | 1063 | scale_act = newToolAction("scaleobjects", tr("Scale objects"), this, SLOT(scaleClicked()), "tool-scale.png", QString{}, "toolbars.html#scale"); |
@@ -1226,6 +1229,7 @@ void MapEditorController::createMenuAndToolbars() |
1226 | 1229 | tools_menu->addAction(boolean_merge_holes_act); |
1227 | 1230 | tools_menu->addAction(cut_tool_act); |
1228 | 1231 | tools_menu->addMenu(cut_hole_menu); |
| 1232 | + tools_menu->addAction(move_parallel_act); |
1229 | 1233 | tools_menu->addAction(rotate_act); |
1230 | 1234 | tools_menu->addAction(rotate_pattern_act); |
1231 | 1235 | tools_menu->addAction(scale_act); |
@@ -1363,6 +1367,7 @@ void MapEditorController::createMenuAndToolbars() |
1363 | 1367 | cut_hole_button->setMenu(cut_hole_menu); |
1364 | 1368 | toolbar_editing->addWidget(cut_hole_button); |
1365 | 1369 |
|
| 1370 | + toolbar_editing->addAction(move_parallel_act); |
1366 | 1371 | toolbar_editing->addAction(rotate_act); |
1367 | 1372 | toolbar_editing->addAction(rotate_pattern_act); |
1368 | 1373 | toolbar_editing->addAction(scale_act); |
@@ -2616,6 +2621,8 @@ void MapEditorController::updateObjectDependentActions() |
2616 | 2621 | cut_tool_act->setStatusTip(tr("Cut the selected objects into smaller parts.") + (cut_tool_act->isEnabled() ? QString{} : QString(QLatin1Char(' ') + tr("Select at least one line or area object to activate this tool.")))); |
2617 | 2622 | convert_to_curves_act->setEnabled(have_area || have_line); |
2618 | 2623 | convert_to_curves_act->setStatusTip(tr("Turn paths made of straight segments into smooth bezier splines.") + (convert_to_curves_act->isEnabled() ? QString{} : QString(QLatin1Char(' ') + tr("Select a path object to activate this tool.")))); |
| 2624 | + move_parallel_act->setEnabled(have_area || have_line); |
| 2625 | + move_parallel_act->setStatusTip(tr("Move lines and area borders in and out.") + (move_parallel_act->isEnabled() ? QString{} : QString(QLatin1Char(' ') + tr("Select at least one line or area object to activate this tool.")))); |
2619 | 2626 | simplify_path_act->setEnabled(have_area || have_line); |
2620 | 2627 | simplify_path_act->setStatusTip(tr("Reduce the number of points in path objects while trying to retain their shape.") + (simplify_path_act->isEnabled() ? QString{} : QString(QLatin1Char(' ') + tr("Select a path object to activate this tool.")))); |
2621 | 2628 |
|
@@ -2719,6 +2726,11 @@ void MapEditorController::editLineToolClicked() |
2719 | 2726 | setTool(new EditLineTool(this, edit_line_tool_act)); |
2720 | 2727 | } |
2721 | 2728 |
|
| 2729 | +void MapEditorController::moveParallelClicked() |
| 2730 | +{ |
| 2731 | + setTool(new MoveParallelTool(this, move_parallel_act)); |
| 2732 | +} |
| 2733 | + |
2722 | 2734 | void MapEditorController::drawPointClicked() |
2723 | 2735 | { |
2724 | 2736 | setTool(new DrawPointTool(this, draw_point_act)); |
|
0 commit comments