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

* use system laf on Windows and Mac, use Nimbus on all the others (Linux, *BSD, ...) 

* visual imrovements under Nimbus LAF
This commit is contained in:
Reinhard Pointner 2009-04-05 21:03:40 +00:00
parent d7a5b58c32
commit 4afc701ff7
5 changed files with 75 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/net/sourceforge/filebot/Main.java
View File

@ -21,6 +21,8 @@ import net.sourceforge.filebot.ui.panel.sfv.SfvPanelBuilder;
import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.args4j.CmdLineParser;
import com.sun.jna.Platform;
public class Main {
@ -47,15 +49,15 @@ public class Main {
initializeSettings();
try {
// UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
// UIManager.setLookAndFeel("a03.swing.plaf.A03LookAndFeel");
// UIManager.setLookAndFeel("org.jvnet.substance.skin.SubstanceBusinessBlueSteelLookAndFeel");
// UIManager.setLookAndFeel("org.jvnet.substance.skin.SubstanceNebulaBrickWallLookAndFeel");
// UIManager.setLookAndFeel("org.jvnet.substance.skin.SubstanceSaharaLookAndFeel");
if (Platform.isWindows() || Platform.isMac()) {
// use native laf of windows and mac
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} else {
// use nimubs laf on linux, bsd, ...
UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
}
} catch (Exception e) {
Logger.getLogger(Main.class.getName()).log(Level.SEVERE, e.toString(), e);
Logger.getLogger(Main.class.getName()).log(Level.WARNING, e.toString(), e);
}
SwingUtilities.invokeLater(new Runnable() {

18
source/net/sourceforge/filebot/format/EpisodeFormatBindingBean.java
View File

@ -122,6 +122,12 @@ public class EpisodeFormatBindingBean {
}
@Define("general")
public SortedMap<String, String> getGeneralMediaInfo() {
return getMediaInfo().snapshot(StreamKind.General, 0);
}
@Define("video")
public SortedMap<String, String> getVideoInfo() {
return getMediaInfo().snapshot(StreamKind.Video, 0);
@ -134,9 +140,15 @@ public class EpisodeFormatBindingBean {
}
@Define("general")
public SortedMap<String, String> getGeneralMediaInfo() {
return getMediaInfo().snapshot(StreamKind.General, 0);
@Define("text")
public SortedMap<String, String> getTextInfo() {
return getMediaInfo().snapshot(StreamKind.Text, 0);
}
@Define("image")
public SortedMap<String, String> getImageInfo() {
return getMediaInfo().snapshot(StreamKind.Image, 0);
}

58
source/net/sourceforge/filebot/ui/panel/episodelist/SeasonSpinnerEditor.java
View File

@ -1,43 +1,57 @@
package net.sourceforge.filebot.ui.panel.episodelist;
import static net.sourceforge.filebot.ui.panel.episodelist.SeasonSpinnerModel.ALL_SEASONS;
import java.awt.Color;
import java.text.ParseException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JSpinner;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.SwingConstants;
import javax.swing.JSpinner.DefaultEditor;
import javax.swing.text.DefaultFormatter;
import javax.swing.text.DefaultFormatterFactory;
class SeasonSpinnerEditor extends JLabel implements ChangeListener {
class SeasonSpinnerEditor extends DefaultEditor {
public SeasonSpinnerEditor(JSpinner spinner) {
setHorizontalAlignment(RIGHT);
super(spinner);
spinner.addChangeListener(this);
setValueFromSpinner(spinner);
setBorder(BorderFactory.createEmptyBorder(1, 3, 1, 3));
getTextField().setFormatterFactory(new DefaultFormatterFactory(new DefaultFormatter() {
setBackground(Color.WHITE);
setOpaque(true);
@Override
public Object stringToValue(String string) throws ParseException {
if ("All Seasons".equals(string)) {
return ALL_SEASONS;
}
Matcher matcher = Pattern.compile("Season (\\d+)").matcher(string);
public void stateChanged(ChangeEvent e) {
setValueFromSpinner((JSpinner) e.getSource());
if (matcher.matches()) {
return Integer.valueOf(matcher.group(1));
}
// negative season number
throw new ParseException("Illegal season number", 0);
}
private void setValueFromSpinner(JSpinner spinner) {
int season = ((SeasonSpinnerModel) spinner.getModel()).getSeason();
@Override
public String valueToString(Object value) throws ParseException {
int season = ((Number) value).intValue();
if (season == ALL_SEASONS)
setText("All Seasons");
else
setText(String.format("Season %d", season));
return "All Seasons";
else if (season >= 1)
return String.format("Season %d", season);
// negative season number
throw new ParseException("Illegal season number", 0);
}
}));
getTextField().setHorizontalAlignment(SwingConstants.RIGHT);
}
}

4
source/net/sourceforge/filebot/ui/panel/list/ListPanel.java
View File

@ -67,9 +67,9 @@ public class ListPanel extends JComponent {
add(new JLabel("Pattern:"), "gapbefore indent");
add(textField, "gap related, wmin 2cm");
add(new JLabel("From:"), "gap 5mm");
add(fromSpinner, "gap related, wmax 12mm, sizegroup spinner");
add(fromSpinner, "gap related, wmax 14mm, sizegroup spinner");
add(new JLabel("To:"), "gap 5mm");
add(toSpinner, "gap related, wmax 12mm, sizegroup spinner");
add(toSpinner, "gap related, wmax 14mm, sizegroup spinner");
add(new JButton(createAction), "gap 7mm, gapafter indent, wrap paragraph");
add(list, "grow");

6
source/net/sourceforge/tuned/ui/FancyTreeCellRenderer.java
View File

@ -40,12 +40,12 @@ public class FancyTreeCellRenderer extends DefaultTreeCellRenderer {
@Override
public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) {
super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, false);
public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) {
super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, false);
setIconTextGap(5);
if (sel) {
if (selected) {
setPaintGradient(true);
setGradientBeginColor(backgroundSelectionColor.brighter());
setGradientEndColor(backgroundSelectionColor);