moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-12-23 16:28:51 -05:00
Code Issues Releases Wiki Activity

+ hide "Override Extension" feature because people seem to activate it by mistake and then complain file extensions are being overriden

Browse Source
This commit is contained in:
Reinhard Pointner 2012-05-31 11:47:30 +00:00
parent 6ba1626666
commit dd3f7e64b2
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
source/net/sourceforge/filebot/ui/rename/RenamePanel.java
View File

@ -73,7 +73,6 @@ public class RenamePanel extends JComponent {
protected final RenameAction renameAction = new RenameAction(renameModel); protected final RenameAction renameAction = new RenameAction(renameModel);
private static final PreferencesEntry<String> persistentOverrideExtension = Settings.forPackage(RenamePanel.class).entry("rename.extension.override").defaultValue("false");
private static final PreferencesEntry<String> persistentEpisodeFormat = Settings.forPackage(RenamePanel.class).entry("rename.format.episode"); private static final PreferencesEntry<String> persistentEpisodeFormat = Settings.forPackage(RenamePanel.class).entry("rename.format.episode");
private static final PreferencesEntry<String> persistentMovieFormat = Settings.forPackage(RenamePanel.class).entry("rename.format.movie"); private static final PreferencesEntry<String> persistentMovieFormat = Settings.forPackage(RenamePanel.class).entry("rename.format.movie");
private static final PreferencesEntry<String> persistentPreferredLanguage = Settings.forPackage(RenamePanel.class).entry("rename.language").defaultValue("en"); private static final PreferencesEntry<String> persistentPreferredLanguage = Settings.forPackage(RenamePanel.class).entry("rename.language").defaultValue("en");
@ -87,9 +86,6 @@ public class RenamePanel extends JComponent {
filesList.setTitle("Original Files"); filesList.setTitle("Original Files");
filesList.setTransferablePolicy(new FilesListTransferablePolicy(renameModel.files())); filesList.setTransferablePolicy(new FilesListTransferablePolicy(renameModel.files()));
// restore state
renameModel.setPreserveExtension(!Boolean.parseBoolean(persistentOverrideExtension.getValue()));
// filename formatter // filename formatter
renameModel.useFormatter(File.class, new FileNameFormatter(renameModel.preserveExtension())); renameModel.useFormatter(File.class, new FileNameFormatter(renameModel.preserveExtension()));
@ -158,8 +154,8 @@ public class RenamePanel extends JComponent {
// create settings popup // create settings popup
final Action settingsPopupAction = new ShowPopupAction("Options", ResourceManager.getIcon("action.report")); final Action settingsPopupAction = new ShowPopupAction("Options", ResourceManager.getIcon("action.report"));
JButton settingsButton = createImageButton(settingsPopupAction); JButton settingsButton = createImageButton(settingsPopupAction);
settingsButton.setAction(openHistoryAction);
ActionPopup settingsPopup = createSettingsPopup(); ActionPopup settingsPopup = createSettingsPopup();
settingsButton.setComponentPopupMenu(settingsPopup);
renameButton.setComponentPopupMenu(settingsPopup); renameButton.setComponentPopupMenu(settingsPopup);
filesList.getButtonPanel().add(settingsButton, "gap 0"); filesList.getButtonPanel().add(settingsButton, "gap 0");
@ -287,31 +283,33 @@ public class RenamePanel extends JComponent {
actionPopup.addSeparator(); actionPopup.addSeparator();
actionPopup.addDescription(new JLabel("History:")); actionPopup.addDescription(new JLabel("History:"));
actionPopup.add(openHistoryAction);
actionPopup.add(new AbstractAction("Open History", ResourceManager.getIcon("action.report")) {
@Override
public void actionPerformed(ActionEvent e) {
History model = HistorySpooler.getInstance().getCompleteHistory();
HistoryDialog dialog = new HistoryDialog(getWindow(RenamePanel.this));
dialog.setLocationRelativeTo(RenamePanel.this);
dialog.setModel(model);
// show and block
dialog.setVisible(true);
if (!model.equals(dialog.getModel())) {
// model was changed, switch to the new model
HistorySpooler.getInstance().commit(dialog.getModel());
}
}
});
return actionPopup; return actionPopup;
} }
protected final Action openHistoryAction = new AbstractAction("Open History", ResourceManager.getIcon("action.report")) {
@Override
public void actionPerformed(ActionEvent e) {
History model = HistorySpooler.getInstance().getCompleteHistory();
HistoryDialog dialog = new HistoryDialog(getWindow(RenamePanel.this));
dialog.setLocationRelativeTo(RenamePanel.this);
dialog.setModel(model);
// show and block
dialog.setVisible(true);
if (!model.equals(dialog.getModel())) {
// model was changed, switch to the new model
HistorySpooler.getInstance().commit(dialog.getModel());
}
}
}
protected static class ShowPopupAction extends AbstractAction { protected static class ShowPopupAction extends AbstractAction {
public ShowPopupAction(String name, Icon icon) { public ShowPopupAction(String name, Icon icon) {
@ -348,9 +346,6 @@ public class RenamePanel extends JComponent {
// display changed state // display changed state
filesList.repaint(); filesList.repaint();
// save state
persistentOverrideExtension.setValue(Boolean.toString(activate));
} }
} }