mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added "Send to" menus

This commit is contained in:
Reinhard Pointner 2016-03-20 10:38:36 +00:00
parent ec501bc2ed
commit 56e13f072f
3 changed files with 87 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/net/filebot/ui/PanelBuilder.java
View File

@ -23,4 +23,12 @@ public interface PanelBuilder {
return new PanelBuilder[] { new RenamePanelBuilder(), new EpisodeListPanelBuilder(), new SubtitlePanelBuilder(), new SfvPanelBuilder(), new AnalyzePanelBuilder(), new ListPanelBuilder() };
}
public static PanelBuilder[] episodeHandlerSequence() {
return new PanelBuilder[] { new RenamePanelBuilder(), new ListPanelBuilder() };
}
public static PanelBuilder[] fileHandlerSequence() {
return new PanelBuilder[] { new RenamePanelBuilder(), new SfvPanelBuilder(), new ListPanelBuilder() };
}
}

107
source/net/filebot/ui/analyze/FileTree.java
View File

@ -1,8 +1,9 @@
package net.filebot.ui.analyze;
import static java.util.Collections.*;
import static java.util.stream.Collectors.*;
import static net.filebot.util.ui.SwingUI.*;
import java.awt.Font;
import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
@ -16,7 +17,7 @@ import java.util.List;
import java.util.Set;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.JTree;
@ -27,8 +28,11 @@ import javax.swing.tree.TreeSelectionModel;
import net.filebot.ResourceManager;
import net.filebot.UserFiles;
import net.filebot.ui.PanelBuilder;
import net.filebot.ui.transfer.FileTransferable;
import net.filebot.util.FilterIterator;
import net.filebot.util.TreeIterator;
import net.filebot.util.ui.SwingEventBus;
public class FileTree extends JTree {
@ -74,70 +78,85 @@ public class FileTree extends JTree {
private class OpenExpandCollapsePopup extends JPopupMenu {
public OpenExpandCollapsePopup() {
TreePath[] selectionPaths = getSelectionPaths();
Set<File> selectionFiles = null;
Collection<File> selectedFiles = getFiles(getSelectionPaths());
if (selectionPaths != null) {
selectionFiles = new LinkedHashSet<File>(selectionPaths.length);
for (TreePath treePath : selectionPaths) {
Object node = treePath.getLastPathComponent();
if (node instanceof FileNode) {
selectionFiles.add(((FileNode) node).getFile());
}
}
}
if (selectionFiles != null && !selectionFiles.isEmpty()) {
JMenuItem openItem = new JMenuItem(new OpenAction("Open", selectionFiles));
openItem.setFont(openItem.getFont().deriveFont(Font.BOLD));
add(openItem);
Set<File> selectionParentFolders = new LinkedHashSet<File>(selectionFiles.size());
for (File file : selectionFiles) {
selectionParentFolders.add(file.getParentFile());
if (selectedFiles != null && !selectedFiles.isEmpty()) {
JMenu menu = new JMenu("Send to");
for (PanelBuilder panel : PanelBuilder.fileHandlerSequence()) {
menu.add(new JMenuItem(new ImportAction(panel, selectedFiles)));
}
add(new OpenAction("Open Folder", selectionParentFolders));
add(menu);
addSeparator();
}
add(expandAction);
add(collapseAction);
if (selectedFiles.size() > 0) {
add(new JMenuItem(new RevealAction("Reveal", selectedFiles)));
add(new RevealAction("Reveal Folder", selectedFiles.stream().map(File::getParentFile).distinct().collect(toList())));
addSeparator();
}
add(newAction("Expand all", ResourceManager.getIcon("tree.expand"), evt -> expandAll()));
add(newAction("Collapse all", ResourceManager.getIcon("tree.collapse"), evt -> collapseAll()));
}
private class OpenAction extends AbstractAction {
private Collection<File> getFiles(TreePath[] selection) {
if (selection == null || selection.length == 0) {
return emptySet();
}
public OpenAction(String text, Collection<File> files) {
Set<File> files = new LinkedHashSet<File>();
for (TreePath path : selection) {
collectFiles(path.getLastPathComponent(), files);
}
return files;
}
private void collectFiles(Object node, Collection<File> files) {
if (node instanceof FileNode) {
files.add(((FileNode) node).getFile());
} else if (node instanceof FolderNode) {
for (Object it : ((FolderNode) node).getChildren()) {
collectFiles(it, files);
}
}
}
private class RevealAction extends AbstractAction {
private Collection<File> files;
public RevealAction(String text, Collection<File> files) {
super(text);
putValue("files", files);
this.files = files;
}
@Override
public void actionPerformed(ActionEvent event) {
UserFiles.revealFiles((Collection) getValue("files"));
UserFiles.revealFiles(files);
}
}
private final Action expandAction = new AbstractAction("Expand all", ResourceManager.getIcon("tree.expand")) {
private class ImportAction extends AbstractAction {
@Override
public void actionPerformed(ActionEvent e) {
expandAll();
private PanelBuilder panel;
private Collection<File> files;
public ImportAction(PanelBuilder panel, Collection<File> files) {
super(panel.getName(), panel.getIcon());
this.panel = panel;
this.files = files;
}
};
private final Action collapseAction = new AbstractAction("Collapse all", ResourceManager.getIcon("tree.collapse")) {
@Override
public void actionPerformed(ActionEvent e) {
collapseAll();
public void actionPerformed(ActionEvent event) {
// switch to panel
SwingEventBus.getInstance().post(panel);
// load files
invokeLater(200, () -> SwingEventBus.getInstance().post(new FileTransferable(files)));
}
};
}
}
private class ExpandCollapsePopupListener extends MouseAdapter {

23
source/net/filebot/ui/episodelist/EpisodeListPanel.java
View File

@ -23,6 +23,7 @@ import javax.swing.AbstractAction;
import javax.swing.Icon;
import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JMenu;
import javax.swing.JPopupMenu;
import javax.swing.JSpinner;
import javax.swing.KeyStroke;
@ -38,8 +39,8 @@ import net.filebot.ui.AbstractSearchPanel;
import net.filebot.ui.FileBotList;
import net.filebot.ui.FileBotListExportHandler;
import net.filebot.ui.LanguageComboBox;
import net.filebot.ui.PanelBuilder;
import net.filebot.ui.SelectDialog;
import net.filebot.ui.rename.RenamePanelBuilder;
import net.filebot.ui.transfer.ArrayTransferable;
import net.filebot.ui.transfer.ClipboardHandler;
import net.filebot.ui.transfer.CompositeTranserable;
@ -253,13 +254,21 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
// popup menu
JPopupMenu popup = new JPopupMenu("Episodes");
popup.add(newAction("Import", ResourceManager.getIcon("database.go"), evt -> {
// switch to Rename panel
SwingEventBus.getInstance().post(new RenamePanelBuilder());
// load episode data
invokeLater(200, () -> SwingEventBus.getInstance().post(EpisodeListExportHandler.export(this, false)));
}));
JMenu menu = new JMenu("Send to");
for (PanelBuilder panel : PanelBuilder.episodeHandlerSequence()) {
menu.add(newAction(panel.getName(), panel.getIcon(), evt -> {
// switch to Rename panel
SwingEventBus.getInstance().post(panel);
// load episode data
invokeLater(200, () -> SwingEventBus.getInstance().post(EpisodeListExportHandler.export(this, false)));
}));
}
popup.add(menu);
popup.addSeparator();
popup.add(newAction("Copy", ResourceManager.getIcon("rename.action.copy"), evt -> {
getTransferHandler().getClipboardHandler().exportToClipboard(this, Toolkit.getDefaultToolkit().getSystemClipboard(), TransferHandler.COPY);
}));