diff --git a/source/net/filebot/resources/action.copy.png b/source/net/filebot/resources/action.copy.png new file mode 100644 index 00000000..c137b0f1 Binary files /dev/null and b/source/net/filebot/resources/action.copy.png differ diff --git a/source/net/filebot/resources/action.copy@2x.png b/source/net/filebot/resources/action.copy@2x.png new file mode 100644 index 00000000..d12cf9c8 Binary files /dev/null and b/source/net/filebot/resources/action.copy@2x.png differ diff --git a/source/net/filebot/resources/action.hardlink.png b/source/net/filebot/resources/action.hardlink.png new file mode 100755 index 00000000..80e4dea0 Binary files /dev/null and b/source/net/filebot/resources/action.hardlink.png differ diff --git a/source/net/filebot/resources/action.hardlink@2x.png b/source/net/filebot/resources/action.hardlink@2x.png new file mode 100755 index 00000000..aab16d59 Binary files /dev/null and b/source/net/filebot/resources/action.hardlink@2x.png differ diff --git a/source/net/filebot/resources/action.keeplink.png b/source/net/filebot/resources/action.keeplink.png new file mode 100644 index 00000000..5b57cc18 Binary files /dev/null and b/source/net/filebot/resources/action.keeplink.png differ diff --git a/source/net/filebot/resources/action.keeplink@2x.png b/source/net/filebot/resources/action.keeplink@2x.png new file mode 100644 index 00000000..44bd240f Binary files /dev/null and b/source/net/filebot/resources/action.keeplink@2x.png differ diff --git a/source/net/filebot/resources/action.symlink.png b/source/net/filebot/resources/action.symlink.png new file mode 100644 index 00000000..cd1ecb9d Binary files /dev/null and b/source/net/filebot/resources/action.symlink.png differ diff --git a/source/net/filebot/resources/action.symlink@2x.png b/source/net/filebot/resources/action.symlink@2x.png new file mode 100644 index 00000000..98eb6930 Binary files /dev/null and b/source/net/filebot/resources/action.symlink@2x.png differ diff --git a/source/net/filebot/resources/rename.action.copy.png b/source/net/filebot/resources/rename.action.copy.png index 8dd48c49..ccaed9e1 100644 Binary files a/source/net/filebot/resources/rename.action.copy.png and b/source/net/filebot/resources/rename.action.copy.png differ diff --git a/source/net/filebot/resources/rename.action.copy@2x.png b/source/net/filebot/resources/rename.action.copy@2x.png new file mode 100755 index 00000000..9f556a04 Binary files /dev/null and b/source/net/filebot/resources/rename.action.copy@2x.png differ diff --git a/source/net/filebot/resources/rename.action.hardlink.png b/source/net/filebot/resources/rename.action.hardlink.png old mode 100644 new mode 100755 index 8679c4b5..2cd29e42 Binary files a/source/net/filebot/resources/rename.action.hardlink.png and b/source/net/filebot/resources/rename.action.hardlink.png differ diff --git a/source/net/filebot/resources/rename.action.hardlink@2x.png b/source/net/filebot/resources/rename.action.hardlink@2x.png new file mode 100755 index 00000000..80e4dea0 Binary files /dev/null and b/source/net/filebot/resources/rename.action.hardlink@2x.png differ diff --git a/source/net/filebot/resources/rename.action.keeplink.png b/source/net/filebot/resources/rename.action.keeplink.png index ae8cae80..9c251399 100644 Binary files a/source/net/filebot/resources/rename.action.keeplink.png and b/source/net/filebot/resources/rename.action.keeplink.png differ diff --git a/source/net/filebot/resources/rename.action.keeplink@2x.png b/source/net/filebot/resources/rename.action.keeplink@2x.png new file mode 100644 index 00000000..5b57cc18 Binary files /dev/null and b/source/net/filebot/resources/rename.action.keeplink@2x.png differ diff --git a/source/net/filebot/resources/rename.action.symlink.png b/source/net/filebot/resources/rename.action.symlink.png index 00be352c..c76a8795 100644 Binary files a/source/net/filebot/resources/rename.action.symlink.png and b/source/net/filebot/resources/rename.action.symlink.png differ diff --git a/source/net/filebot/resources/rename.action.symlink@2x.png b/source/net/filebot/resources/rename.action.symlink@2x.png new file mode 100644 index 00000000..cd1ecb9d Binary files /dev/null and b/source/net/filebot/resources/rename.action.symlink@2x.png differ diff --git a/source/net/filebot/resources/search.generic.png b/source/net/filebot/resources/search.generic.png old mode 100755 new mode 100644 index e3d66181..4f7f8b83 Binary files a/source/net/filebot/resources/search.generic.png and b/source/net/filebot/resources/search.generic.png differ diff --git a/source/net/filebot/resources/search.generic@2x.png b/source/net/filebot/resources/search.generic@2x.png new file mode 100644 index 00000000..7c4b1ca1 Binary files /dev/null and b/source/net/filebot/resources/search.generic@2x.png differ diff --git a/source/net/filebot/ui/rename/RenamePanel.java b/source/net/filebot/ui/rename/RenamePanel.java index 35a54789..005649cc 100644 --- a/source/net/filebot/ui/rename/RenamePanel.java +++ b/source/net/filebot/ui/rename/RenamePanel.java @@ -563,7 +563,7 @@ public class RenamePanel extends JComponent { actionPopup.addDescription(new JLabel("Action:")); for (StandardRenameAction action : EnumSet.of(StandardRenameAction.MOVE, StandardRenameAction.COPY, StandardRenameAction.KEEPLINK, StandardRenameAction.SYMLINK, StandardRenameAction.HARDLINK)) { - actionPopup.add(new SetRenameAction(action, action.getDisplayName(), ResourceManager.getIcon("rename.action." + action.toString().toLowerCase()))); + actionPopup.add(new SetRenameAction(action)); } return actionPopup; @@ -749,7 +749,7 @@ public class RenamePanel extends JComponent { } if (preset.getRenameAction() != null) { - new SetRenameAction(preset.getRenameAction(), preset.getRenameAction().getDisplayName(), ResourceManager.getIcon("rename.action." + preset.getRenameAction().toString().toLowerCase())).actionPerformed(evt); + new SetRenameAction(preset.getRenameAction()).actionPerformed(evt); } super.actionPerformed(evt); @@ -786,8 +786,8 @@ public class RenamePanel extends JComponent { private final StandardRenameAction action; - public SetRenameAction(StandardRenameAction action, String name, Icon icon) { - super(name, icon); + public SetRenameAction(StandardRenameAction action) { + super(action.getDisplayName(), ResourceManager.getIcon("rename.action." + action.name().toLowerCase())); this.action = action; } @@ -798,7 +798,7 @@ public class RenamePanel extends JComponent { } else { renameAction.putValue(RenameAction.RENAME_ACTION, action); renameAction.putValue(NAME, this.getValue(NAME)); - renameAction.putValue(SMALL_ICON, this.getValue(SMALL_ICON)); + renameAction.putValue(SMALL_ICON, ResourceManager.getIcon("action." + action.name().toLowerCase())); } } }