moparisthebest
/
filebot
mirror of https://github.com/mitb-archive/filebot
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow paste of multi-line expression formats

This commit is contained in:
Reinhard Pointner 2016-08-10 21:01:05 +08:00
parent 0ae7161b47
commit 985556b3f2
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/net/filebot/ui/list/ListPanel.java
View File

@ -29,8 +29,6 @@ import javax.swing.JTextField;
import javax.swing.SpinnerNumberModel; import javax.swing.SpinnerNumberModel;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.TransferHandler; import javax.swing.TransferHandler;
import javax.swing.text.AttributeSet;
import javax.swing.text.BadLocationException;
import org.fife.ui.rsyntaxtextarea.RSyntaxDocument; import org.fife.ui.rsyntaxtextarea.RSyntaxDocument;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
@ -169,12 +167,7 @@ public class ListPanel extends JComponent {
} }
private RSyntaxTextArea createEditor() { private RSyntaxTextArea createEditor() {
RSyntaxTextArea editor = new RSyntaxTextArea(new RSyntaxDocument(SyntaxConstants.SYNTAX_STYLE_GROOVY) { RSyntaxTextArea editor = new RSyntaxTextArea(new RSyntaxDocument(SyntaxConstants.SYNTAX_STYLE_GROOVY), "", 1, 80);
@Override
public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
super.insertString(offs, str.replaceAll("\\R", ""), a); // FORCE SINGLE LINE
}
}, null, 1, 80);
editor.setAntiAliasingEnabled(true); editor.setAntiAliasingEnabled(true);
editor.setAnimateBracketMatching(false); editor.setAnimateBracketMatching(false);
@ -187,7 +180,9 @@ public class ListPanel extends JComponent {
editor.setUseFocusableTips(false); editor.setUseFocusableTips(false);
editor.setHighlightCurrentLine(false); editor.setHighlightCurrentLine(false);
editor.setLineWrap(false); editor.setLineWrap(false);
editor.setPaintMarkOccurrencesBorder(false);
editor.setPaintTabLines(false);
editor.setMarkOccurrences(false);
editor.setFont(new Font(MONOSPACED, PLAIN, 14)); editor.setFont(new Font(MONOSPACED, PLAIN, 14));
// update format on change // update format on change

1
source/net/filebot/ui/rename/FormatDialog.java
View File

@ -327,7 +327,6 @@ public class FormatDialog extends JDialog {
editor.setPaintMarkOccurrencesBorder(false); editor.setPaintMarkOccurrencesBorder(false);
editor.setPaintTabLines(false); editor.setPaintTabLines(false);
editor.setMarkOccurrences(false); editor.setMarkOccurrences(false);
editor.setFont(new Font(MONOSPACED, PLAIN, 14)); editor.setFont(new Font(MONOSPACED, PLAIN, 14));
// update format on change // update format on change

14
source/net/filebot/ui/rename/PresetEditor.java
View File

@ -3,7 +3,6 @@ package net.filebot.ui.rename;
import static java.awt.Font.*; import static java.awt.Font.*;
import static javax.swing.BorderFactory.*; import static javax.swing.BorderFactory.*;
import static net.filebot.Logging.*; import static net.filebot.Logging.*;
import static net.filebot.similarity.Normalization.*;
import static net.filebot.util.ui.SwingUI.*; import static net.filebot.util.ui.SwingUI.*;
import java.awt.Component; import java.awt.Component;
@ -31,8 +30,6 @@ import javax.swing.JPopupMenu;
import javax.swing.JRadioButton; import javax.swing.JRadioButton;
import javax.swing.JTextField; import javax.swing.JTextField;
import javax.swing.ListCellRenderer; import javax.swing.ListCellRenderer;
import javax.swing.text.AttributeSet;
import javax.swing.text.BadLocationException;
import org.fife.ui.rsyntaxtextarea.RSyntaxDocument; import org.fife.ui.rsyntaxtextarea.RSyntaxDocument;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
@ -205,13 +202,7 @@ public class PresetEditor extends JDialog {
} }
private RSyntaxTextArea createEditor() { private RSyntaxTextArea createEditor() {
final RSyntaxTextArea editor = new RSyntaxTextArea(new RSyntaxDocument(SyntaxConstants.SYNTAX_STYLE_GROOVY) { RSyntaxTextArea editor = new RSyntaxTextArea(new RSyntaxDocument(SyntaxConstants.SYNTAX_STYLE_GROOVY), "", 1, 80);
@Override
public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
super.insertString(offs, replaceSpace(str, " "), a); // FORCE SINGLE LINE
}
}, null, 1, 80);
editor.setAntiAliasingEnabled(true); editor.setAntiAliasingEnabled(true);
editor.setAnimateBracketMatching(false); editor.setAnimateBracketMatching(false);
@ -224,6 +215,9 @@ public class PresetEditor extends JDialog {
editor.setUseFocusableTips(false); editor.setUseFocusableTips(false);
editor.setHighlightCurrentLine(false); editor.setHighlightCurrentLine(false);
editor.setLineWrap(false); editor.setLineWrap(false);
editor.setPaintMarkOccurrencesBorder(false);
editor.setPaintTabLines(false);
editor.setMarkOccurrences(false);
editor.setFont(new Font(MONOSPACED, PLAIN, 14)); editor.setFont(new Font(MONOSPACED, PLAIN, 14));
return editor; return editor;