BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-11 01:32:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

Duplicate selection option in Edit menu and popup menu (Ctrl+D)

Browse Source
This commit is contained in:
Branislav Stojkovic
2017-05-06 13:56:54 +02:00
parent c7d8e8e0f0
commit d84f7dadf5
12 changed files with 132 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-core/src/org/diylc/common/IPlugInPort.java
+5
View File
@@ -183,6 +183,11 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
*/
void pasteComponents(Collection<IDIYComponent<?>> components);
/**
* Duplicates selected components and places them nearby.
*/
void duplicateSelection();
/**
* Deletes all the selected components from the project.
*/
diylc/diylc-core/src/org/diylc/presenter/Presenter.java
+32
View File
@@ -1410,6 +1410,38 @@ public class Presenter implements IPlugInPort {
instantiationManager.getFirstControlPoint());
}
@Override
public void duplicateSelection() {
LOG.info("duplicateSelection()");
if (selectedComponents.isEmpty()) {
LOG.debug("Nothing to duplicate");
return;
}
Project oldProject = currentProject.clone();
Set<IDIYComponent<?>> newSelection = new HashSet<IDIYComponent<?>>();
int grid = (int) currentProject.getGridSpacing().convertToPixels();
for (IDIYComponent<?> component : this.selectedComponents) {
try {
IDIYComponent<?> cloned = component.clone();
newSelection.add(cloned);
for (int i = 0; i < component.getControlPointCount(); i++) {
Point p = component.getControlPoint(i);
Point newPoint = new Point(p.x + grid, p.y + grid);
cloned.setControlPoint(newPoint, i);
}
currentProject.getComponents().add(cloned);
} catch (Exception e) {
}
}
updateSelection(newSelection);
messageDispatcher.dispatchMessage(EventType.PROJECT_MODIFIED, oldProject, currentProject.clone(), "Duplicate");
projectFileManager.notifyFileChange();
messageDispatcher.dispatchMessage(EventType.REPAINT);
}
@Override
public void deleteSelectedComponents() {
LOG.info("deleteSelectedComponents()");
diylc/diylc-library/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/library/main.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/src/org/diylc/images/IconLoader.java
+2 -1
View File
@@ -39,7 +39,8 @@ public enum IconLoader {
"messages.png"), SearchBox("search-box.png"), Screwdriver("screwdriver.png"), Hammer("hammer.png"), FlipHorizontal(
"flip_horizontal.png"), FlipVertical("flip_vertical.png"), MagicWand("magic_wand.png"), PinGrey("pin_grey.png"), PinGreen(
"pin_green.png"), CoffeebeanEdit("coffeebean_edit.png"), ApplicationEdit("application_edit.png"), ComponentAdd(
"component_add.png"), History("history.png"), DocumentPlain("document_plain.png"), FitToSize("fit_to_size.png");
"component_add.png"), History("history.png"), DocumentPlain("document_plain.png"), FitToSize("fit_to_size.png"), DocumentsGear(
"documents_gear.png");
protected String name;
diylc/diylc-swing/src/org/diylc/images/documents_gear.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 782 B

diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
+58 -27
View File
@@ -114,6 +114,10 @@ public class ActionFactory {
return new PasteAction(plugInPort, clipboard);
}
public DuplicateAction createDuplicateAction(IPlugInPort plugInPort) {
return new DuplicateAction(plugInPort);
}
public SelectAllAction createSelectAllAction(IPlugInPort plugInPort) {
return new SelectAllAction(plugInPort);
}
@@ -652,33 +656,6 @@ public class ActionFactory {
}
}
public static class CopyAction extends AbstractAction {
private static final long serialVersionUID = 1L;
private IPlugInPort plugInPort;
private Clipboard clipboard;
private ClipboardOwner clipboardOwner;
public CopyAction(IPlugInPort plugInPort, Clipboard clipboard, ClipboardOwner clipboardOwner) {
super();
this.plugInPort = plugInPort;
this.clipboard = clipboard;
this.clipboardOwner = clipboardOwner;
putValue(AbstractAction.NAME, "Copy");
putValue(AbstractAction.ACCELERATOR_KEY,
KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(AbstractAction.SMALL_ICON, IconLoader.Copy.getIcon());
}
@Override
public void actionPerformed(ActionEvent e) {
LOG.info("Copy triggered");
clipboard.setContents(new ComponentTransferable(cloneComponents(plugInPort.getSelectedComponents())),
clipboardOwner);
}
}
public static class PasteAction extends AbstractAction {
private static final long serialVersionUID = 1L;
@@ -710,6 +687,60 @@ public class ActionFactory {
}
}
public static class CopyAction extends AbstractAction {
private static final long serialVersionUID = 1L;
private IPlugInPort plugInPort;
private Clipboard clipboard;
private ClipboardOwner clipboardOwner;
public CopyAction(IPlugInPort plugInPort, Clipboard clipboard, ClipboardOwner clipboardOwner) {
super();
this.plugInPort = plugInPort;
this.clipboard = clipboard;
this.clipboardOwner = clipboardOwner;
putValue(AbstractAction.NAME, "Copy");
putValue(AbstractAction.ACCELERATOR_KEY,
KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(AbstractAction.SMALL_ICON, IconLoader.Copy.getIcon());
}
@Override
public void actionPerformed(ActionEvent e) {
LOG.info("Copy triggered");
clipboard.setContents(new ComponentTransferable(cloneComponents(plugInPort.getSelectedComponents())),
clipboardOwner);
}
}
public static class DuplicateAction extends AbstractAction {
private static final long serialVersionUID = 1L;
private IPlugInPort plugInPort;
public DuplicateAction(IPlugInPort plugInPort) {
super();
this.plugInPort = plugInPort;
putValue(AbstractAction.NAME, "Duplicate");
putValue(AbstractAction.ACCELERATOR_KEY,
KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(AbstractAction.SMALL_ICON, IconLoader.DocumentsGear.getIcon());
}
@Override
public void actionPerformed(ActionEvent e) {
LOG.info("Duplicate triggered");
try {
plugInPort.duplicateSelection();
} catch (Exception ex) {
LOG.error("Coule not duplicate.", ex);
}
}
}
private static List<IDIYComponent<?>> cloneComponents(Collection<IDIYComponent<?>> components) {
List<IDIYComponent<?>> result = new ArrayList<IDIYComponent<?>>(components.size());
for (IDIYComponent<?> component : components) {
diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
+16 -4
View File
@@ -64,6 +64,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
private ActionFactory.CutAction cutAction;
private ActionFactory.CopyAction copyAction;
private ActionFactory.PasteAction pasteAction;
private ActionFactory.DuplicateAction duplicateAction;
private ActionFactory.EditSelectionAction editSelectionAction;
private ActionFactory.DeleteSelectionAction deleteSelectionAction;
private ActionFactory.SaveAsTemplateAction saveAsTemplateAction;
@@ -138,6 +139,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
boolean enabled = !plugInPort.getSelectedComponents().isEmpty();
getCutAction().setEnabled(enabled);
getCopyAction().setEnabled(enabled);
getDuplicateAction().setEnabled(enabled);
try {
getPasteAction().setEnabled(clipboard.isDataFlavorAvailable(ComponentTransferable.listFlavor));
} catch (Exception ex) {
@@ -172,7 +174,8 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
@Override
public void keyPressed(KeyEvent e) {
if (plugInPort.keyPressed(e.getKeyCode(), Utils.isMac() ? e.isMetaDown() : e.isControlDown(), e.isShiftDown(), e.isAltDown())) {
if (plugInPort.keyPressed(e.getKeyCode(), Utils.isMac() ? e.isMetaDown() : e.isControlDown(),
e.isShiftDown(), e.isAltDown())) {
e.consume();
}
}
@@ -183,7 +186,8 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
@Override
public void mouseMoved(MouseEvent e) {
canvasPanel.setCursor(plugInPort.getCursorAt(e.getPoint()));
plugInPort.mouseMoved(e.getPoint(), Utils.isMac() ? e.isMetaDown() : e.isControlDown(), e.isShiftDown(), e.isAltDown());
plugInPort.mouseMoved(e.getPoint(), Utils.isMac() ? e.isMetaDown() : e.isControlDown(), e.isShiftDown(),
e.isAltDown());
}
});
@@ -191,8 +195,8 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
@Override
public void mouseClicked(MouseEvent e) {
plugInPort.mouseClicked(e.getPoint(), e.getButton(), Utils.isMac() ? e.isMetaDown() : e.isControlDown(), e.isShiftDown(),
e.isAltDown(), e.getClickCount());
plugInPort.mouseClicked(e.getPoint(), e.getButton(), Utils.isMac() ? e.isMetaDown() : e.isControlDown(),
e.isShiftDown(), e.isAltDown(), e.getClickCount());
}
});
}
@@ -279,6 +283,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
popupMenu.add(getCutAction());
popupMenu.add(getCopyAction());
popupMenu.add(getPasteAction());
popupMenu.add(getDuplicateAction());
popupMenu.addSeparator();
popupMenu.add(getEditSelectionAction());
popupMenu.add(getDeleteSelectionAction());
@@ -411,6 +416,13 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
return pasteAction;
}
public ActionFactory.DuplicateAction getDuplicateAction() {
if (duplicateAction == null) {
duplicateAction = ActionFactory.getInstance().createDuplicateAction(plugInPort);
}
return duplicateAction;
}
public ActionFactory.EditSelectionAction getEditSelectionAction() {
if (editSelectionAction == null) {
editSelectionAction = ActionFactory.getInstance().createEditSelectionAction(plugInPort);
diylc/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java
+10
View File
@@ -35,6 +35,7 @@ public class EditMenuPlugin implements IPlugIn, ClipboardOwner {
private ActionFactory.CutAction cutAction;
private ActionFactory.CopyAction copyAction;
private ActionFactory.PasteAction pasteAction;
private ActionFactory.DuplicateAction duplicateAction;
private ActionFactory.EditSelectionAction editSelectionAction;
private ActionFactory.DeleteSelectionAction deleteSelectionAction;
private ActionFactory.GroupAction groupAction;
@@ -104,6 +105,13 @@ public class EditMenuPlugin implements IPlugIn, ClipboardOwner {
return pasteAction;
}
public ActionFactory.DuplicateAction getDuplicateAction() {
if (duplicateAction == null) {
duplicateAction = ActionFactory.getInstance().createDuplicateAction(plugInPort);
}
return duplicateAction;
}
public ActionFactory.EditSelectionAction getEditSelectionAction() {
if (editSelectionAction == null) {
editSelectionAction = ActionFactory.getInstance().createEditSelectionAction(plugInPort);
@@ -246,6 +254,7 @@ public class EditMenuPlugin implements IPlugIn, ClipboardOwner {
swingUI.injectMenuAction(getCutAction(), EDIT_TITLE);
swingUI.injectMenuAction(getCopyAction(), EDIT_TITLE);
swingUI.injectMenuAction(getPasteAction(), EDIT_TITLE);
swingUI.injectMenuAction(getDuplicateAction(), EDIT_TITLE);
swingUI.injectMenuAction(null, EDIT_TITLE);
swingUI.injectMenuAction(actionFactory.createSelectAllAction(plugInPort), EDIT_TITLE);
swingUI.injectMenuAction(getEditSelectionAction(), EDIT_TITLE);
@@ -305,6 +314,7 @@ public class EditMenuPlugin implements IPlugIn, ClipboardOwner {
boolean enabled = !plugInPort.getSelectedComponents().isEmpty();
getCutAction().setEnabled(enabled);
getCopyAction().setEnabled(enabled);
getDuplicateAction().setEnabled(enabled);
try {
getPasteAction().setEnabled(clipboard.isDataFlavorAvailable(ComponentTransferable.listFlavor));
} catch (Exception e) {
diylc/diylc-swing/update.xml
+4
View File
@@ -1774,6 +1774,10 @@
<changeType>NEW_FEATURE</changeType>
<description>Ability to change PCB board shape from rectangular to oval.</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType>
<description>Duplicate selection option in Edit menu and popup menu (Ctrl+D).</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType>
<description>Added bitchin new splash screen</description>