1
0
mirror of https://github.com/mitb-archive/filebot synced 2024-12-23 00:08:51 -05:00

Refactor hard-coded colours into ThemeSupport

This commit is contained in:
Reinhard Pointner 2019-02-24 15:16:45 +07:00
parent 4d31de4603
commit 9e23e6dd55
4 changed files with 12 additions and 15 deletions

View File

@ -5,6 +5,7 @@ import static javax.swing.BorderFactory.*;
import static net.filebot.Logging.*;
import static net.filebot.UserFiles.*;
import static net.filebot.platform.mac.MacAppUtilities.*;
import static net.filebot.ui.ThemeSupport.*;
import static net.filebot.util.FileUtilities.*;
import static net.filebot.util.ui.SwingUI.*;
@ -56,8 +57,6 @@ import net.filebot.ui.HeaderPanel;
import net.filebot.ui.transfer.DefaultTransferHandler;
import net.filebot.ui.transfer.FileTransferable;
import net.filebot.ui.transfer.TransferablePolicy;
import net.filebot.util.ui.GradientStyle;
import net.filebot.util.ui.notification.SeparatorBorder;
import net.filebot.util.ui.notification.SeparatorBorder.Position;
import net.miginfocom.swing.MigLayout;
@ -184,7 +183,7 @@ public class DropToUnlock extends JList<File> {
h.getTitleLabel().setBorder(createEmptyBorder(0, 0, 0, 64));
JLabel help = new JLabel("<html>FileBot does not have permission to access the folder above. To allow FileBot access, drag and drop the folder from Finder onto the drop area above</b>. The permissions for this folder (and all the folders it contains) will be remembered and FileBot will not need to ask for it again.</html>");
help.setBorder(createCompoundBorder(new SeparatorBorder(1, new Color(0xB4B4B4), new Color(0xACACAC), GradientStyle.LEFT_TO_RIGHT, Position.TOP), createTitledBorder("About App Sandboxing")));
help.setBorder(createCompoundBorder(getSeparatorBorder(Position.TOP), createTitledBorder("About App Sandboxing")));
c.add(h, "wmin 150px, hmin 75px, growx, dock north");
c.add(d, "wmin 150px, hmin 150px, grow");

View File

@ -8,6 +8,7 @@ import static javax.swing.BorderFactory.*;
import static javax.swing.KeyStroke.*;
import static net.filebot.Logging.*;
import static net.filebot.Settings.*;
import static net.filebot.ui.ThemeSupport.*;
import static net.filebot.util.ExceptionUtilities.*;
import static net.filebot.util.FileUtilities.*;
import static net.filebot.util.ui.SwingUI.*;
@ -197,9 +198,8 @@ public class FormatDialog extends JDialog {
title.setFont(title.getFont().deriveFont(BOLD));
JPanel header = new JPanel(new MigLayout("insets dialog, nogrid, novisualpadding"));
header.setBackground(Color.white);
header.setBorder(new SeparatorBorder(1, new Color(0xB4B4B4), new Color(0xACACAC), GradientStyle.LEFT_TO_RIGHT, Position.BOTTOM));
header.setBackground(getPanelBackground());
header.setBorder(getSeparatorBorder(Position.BOTTOM));
header.add(progressIndicator, "pos 1al 0al, hidemode 3");
header.add(title, "wmin 150px, wrap unrel:push");

View File

@ -10,6 +10,7 @@ import static net.filebot.Logging.*;
import static net.filebot.Settings.*;
import static net.filebot.UserFiles.*;
import static net.filebot.media.XattrMetaInfo.*;
import static net.filebot.ui.ThemeSupport.*;
import static net.filebot.util.FileUtilities.*;
import static net.filebot.util.RegularExpressions.*;
import static net.filebot.util.ui.SwingUI.*;
@ -72,19 +73,17 @@ import javax.swing.table.TableRowSorter;
import net.filebot.History;
import net.filebot.History.Element;
import net.filebot.History.Sequence;
import net.filebot.platform.mac.MacAppUtilities;
import net.filebot.HistorySpooler;
import net.filebot.ResourceManager;
import net.filebot.StandardRenameAction;
import net.filebot.platform.mac.MacAppUtilities;
import net.filebot.ui.transfer.FileExportHandler;
import net.filebot.ui.transfer.FileTransferablePolicy;
import net.filebot.ui.transfer.LoadAction;
import net.filebot.ui.transfer.SaveAction;
import net.filebot.ui.transfer.TransferablePolicy;
import net.filebot.util.FileUtilities.ExtensionFileFilter;
import net.filebot.util.ui.GradientStyle;
import net.filebot.util.ui.LazyDocumentListener;
import net.filebot.util.ui.notification.SeparatorBorder;
import net.filebot.util.ui.notification.SeparatorBorder.Position;
import net.miginfocom.swing.MigLayout;
@ -110,9 +109,8 @@ class HistoryDialog extends JDialog {
title.setFont(title.getFont().deriveFont(BOLD));
JPanel header = new JPanel(new MigLayout("insets dialog, nogrid, fillx"));
header.setBackground(Color.white);
header.setBorder(new SeparatorBorder(1, new Color(0xB4B4B4), new Color(0xACACAC), GradientStyle.LEFT_TO_RIGHT, Position.BOTTOM));
header.setBackground(getPanelBackground());
header.setBorder(getSeparatorBorder(Position.BOTTOM));
header.add(title, "wrap");
header.add(infoLabel, "gap indent*2, wrap");

View File

@ -5,6 +5,7 @@ import static java.util.Collections.*;
import static java.util.regex.Pattern.*;
import static java.util.stream.Collectors.*;
import static net.filebot.similarity.Normalization.*;
import static net.filebot.ui.ThemeSupport.*;
import static net.filebot.util.RegularExpressions.*;
import static net.filebot.util.ui.SwingUI.*;
@ -70,9 +71,8 @@ public class SubtitleViewer extends JFrame {
titleLabel.setFont(titleLabel.getFont().deriveFont(BOLD));
JPanel header = new JPanel(new MigLayout("insets dialog, nogrid, novisualpadding, fillx"));
header.setBackground(Color.white);
header.setBorder(new SeparatorBorder(1, new Color(0xB4B4B4), new Color(0xACACAC), GradientStyle.LEFT_TO_RIGHT, Position.BOTTOM));
header.setBackground(getPanelBackground());
header.setBorder(getSeparatorBorder(Position.BOTTOM));
header.add(titleLabel, "wrap, h pref!");
header.add(infoLabel, "gap indent*2, h pref!, wrap");