From 35f8317fd35364e270946fa26f779630868d520f Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Wed, 27 Feb 2019 23:18:57 +0700 Subject: [PATCH] Fix various Dark Mode issues --- source/net/filebot/ui/ThemeSupport.java | 2 +- source/net/filebot/ui/episodelist/SeasonSpinnerEditor.java | 4 ++-- source/net/filebot/ui/filter/AttributeTool.java | 6 +++--- source/net/filebot/ui/filter/ExtractTool.java | 5 +++-- source/net/filebot/ui/filter/MediaInfoTool.java | 6 +++--- source/net/filebot/ui/rename/ConflictDialog.java | 4 ++-- source/net/filebot/ui/rename/HistoryDialog.java | 3 +-- source/net/filebot/ui/rename/PresetEditor.java | 2 +- source/net/filebot/ui/sfv/ChecksumTable.java | 6 +++--- source/net/filebot/ui/subtitle/SubtitleViewer.java | 2 -- 10 files changed, 19 insertions(+), 21 deletions(-) diff --git a/source/net/filebot/ui/ThemeSupport.java b/source/net/filebot/ui/ThemeSupport.java index 68da6198..4603958e 100644 --- a/source/net/filebot/ui/ThemeSupport.java +++ b/source/net/filebot/ui/ThemeSupport.java @@ -102,7 +102,7 @@ public class ThemeSupport { UIManager.setLookAndFeel(new DarculaLaf()); Color selectionBackground = new Color(0x39698a); - Color componentBackground = new Color(0x313131); + Color componentBackground = new Color(0x3A3D3E); UIManager.put("List.selectionBackground", selectionBackground); UIManager.put("ComboBox.selectionBackground", selectionBackground); diff --git a/source/net/filebot/ui/episodelist/SeasonSpinnerEditor.java b/source/net/filebot/ui/episodelist/SeasonSpinnerEditor.java index 2da38a35..22fc694f 100644 --- a/source/net/filebot/ui/episodelist/SeasonSpinnerEditor.java +++ b/source/net/filebot/ui/episodelist/SeasonSpinnerEditor.java @@ -1,8 +1,8 @@ package net.filebot.ui.episodelist; +import static net.filebot.ui.ThemeSupport.*; import static net.filebot.ui.episodelist.SeasonSpinnerModel.*; -import java.awt.Color; import java.text.ParseException; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -52,6 +52,6 @@ class SeasonSpinnerEditor extends DefaultEditor { })); getTextField().setHorizontalAlignment(SwingConstants.RIGHT); - getTextField().setBackground(Color.white); + getTextField().setBackground(getPanelBackground()); } } diff --git a/source/net/filebot/ui/filter/AttributeTool.java b/source/net/filebot/ui/filter/AttributeTool.java index 40c5ff31..88ccd4dc 100644 --- a/source/net/filebot/ui/filter/AttributeTool.java +++ b/source/net/filebot/ui/filter/AttributeTool.java @@ -3,9 +3,9 @@ package net.filebot.ui.filter; import static javax.swing.BorderFactory.*; import static net.filebot.MediaTypes.*; import static net.filebot.media.XattrMetaInfo.*; +import static net.filebot.ui.ThemeSupport.*; import static net.filebot.util.FileUtilities.*; -import java.awt.Color; import java.io.File; import java.util.ArrayList; import java.util.List; @@ -37,8 +37,8 @@ class AttributeTool extends Tool { table.setAutoResizeMode(JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS); table.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - table.setBackground(Color.white); - table.setGridColor(new Color(0xEEEEEE)); + table.setBackground(getPanelBackground()); + table.setGridColor(getColor(0xEEEEEE)); table.setRowHeight(25); JScrollPane scrollPane = new JScrollPane(table); diff --git a/source/net/filebot/ui/filter/ExtractTool.java b/source/net/filebot/ui/filter/ExtractTool.java index 34dcf342..0e03d296 100644 --- a/source/net/filebot/ui/filter/ExtractTool.java +++ b/source/net/filebot/ui/filter/ExtractTool.java @@ -2,6 +2,7 @@ package net.filebot.ui.filter; import static net.filebot.Logging.*; import static net.filebot.UserFiles.*; +import static net.filebot.ui.ThemeSupport.*; import static net.filebot.util.FileUtilities.*; import static net.filebot.util.ui.SwingUI.*; @@ -56,8 +57,8 @@ class ExtractTool extends Tool { table.setAutoResizeMode(JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS); table.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - table.setBackground(Color.white); - table.setGridColor(new Color(0xEEEEEE)); + table.setBackground(getPanelBackground()); + table.setGridColor(getColor(0xEEEEEE)); table.setRowHeight(25); JScrollPane tableScrollPane = new JScrollPane(table); diff --git a/source/net/filebot/ui/filter/MediaInfoTool.java b/source/net/filebot/ui/filter/MediaInfoTool.java index 53b64846..89c62834 100644 --- a/source/net/filebot/ui/filter/MediaInfoTool.java +++ b/source/net/filebot/ui/filter/MediaInfoTool.java @@ -4,9 +4,9 @@ import static java.util.Collections.*; import static javax.swing.BorderFactory.*; import static net.filebot.Logging.*; import static net.filebot.MediaTypes.*; +import static net.filebot.ui.ThemeSupport.*; import static net.filebot.util.FileUtilities.*; -import java.awt.Color; import java.io.File; import java.util.List; import java.util.Map; @@ -42,8 +42,8 @@ class MediaInfoTool extends Tool { table.setCellSelectionEnabled(true); table.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - table.setBackground(Color.white); - table.setGridColor(new Color(0xEEEEEE)); + table.setBackground(getPanelBackground()); + table.setGridColor(getColor(0xEEEEEE)); table.setRowHeight(25); JScrollPane scrollPane = new JScrollPane(table); diff --git a/source/net/filebot/ui/rename/ConflictDialog.java b/source/net/filebot/ui/rename/ConflictDialog.java index c4297cfb..d53381b9 100644 --- a/source/net/filebot/ui/rename/ConflictDialog.java +++ b/source/net/filebot/ui/rename/ConflictDialog.java @@ -3,10 +3,10 @@ package net.filebot.ui.rename; import static java.util.Arrays.*; import static java.util.Collections.*; import static java.util.stream.Collectors.*; +import static net.filebot.ui.ThemeSupport.*; import static net.filebot.util.FileUtilities.*; import static net.filebot.util.ui.SwingUI.*; -import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.awt.Window; @@ -67,7 +67,7 @@ class ConflictDialog extends JDialog { table.addMouseListener(new OpenListener()); // force white background (e.g. GTK LaF default table background is gray) - setBackground(Color.WHITE); + setBackground(getPanelBackground()); JComponent c = (JComponent) getContentPane(); c.setLayout(new MigLayout("insets dialog, nogrid, fill", "", "[fill][pref!]")); diff --git a/source/net/filebot/ui/rename/HistoryDialog.java b/source/net/filebot/ui/rename/HistoryDialog.java index 2494089d..42ce0e0b 100644 --- a/source/net/filebot/ui/rename/HistoryDialog.java +++ b/source/net/filebot/ui/rename/HistoryDialog.java @@ -15,7 +15,6 @@ import static net.filebot.util.FileUtilities.*; import static net.filebot.util.RegularExpressions.*; import static net.filebot.util.ui.SwingUI.*; -import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.awt.Window; @@ -286,7 +285,7 @@ class HistoryDialog extends JDialog { private JTable createTable(TableModel model) { JTable table = new JTable(model); - table.setBackground(Color.white); + table.setBackground(getPanelBackground()); table.setAutoCreateRowSorter(true); table.setFillsViewportHeight(true); diff --git a/source/net/filebot/ui/rename/PresetEditor.java b/source/net/filebot/ui/rename/PresetEditor.java index 37e0d194..2082bd9a 100644 --- a/source/net/filebot/ui/rename/PresetEditor.java +++ b/source/net/filebot/ui/rename/PresetEditor.java @@ -136,7 +136,7 @@ public class PresetEditor extends JDialog { providerCombo.addItemListener((evt) -> updateComponentStates()); updateComponentStates(); - setSize(730, 570); + setSize(730, 600); // add helpful tooltips filterEditor.setToolTipText(FILE_FILTER_TOOLTIP); diff --git a/source/net/filebot/ui/sfv/ChecksumTable.java b/source/net/filebot/ui/sfv/ChecksumTable.java index bc128442..3b85167c 100644 --- a/source/net/filebot/ui/sfv/ChecksumTable.java +++ b/source/net/filebot/ui/sfv/ChecksumTable.java @@ -2,8 +2,8 @@ package net.filebot.ui.sfv; import static net.filebot.hash.VerificationUtilities.*; +import static net.filebot.ui.ThemeSupport.*; -import java.awt.Color; import java.awt.event.MouseEvent; import javax.swing.JTable; @@ -29,8 +29,8 @@ class ChecksumTable extends JTable { setUI(new DragDropRowTableUI()); // force white background (e.g. gtk-laf default table background is gray) - setBackground(Color.WHITE); - setGridColor(Color.LIGHT_GRAY); + setBackground(getPanelBackground()); + setGridColor(getColor(0xEEEEEE)); // highlight CRC32 patterns in filenames in green and with smaller font-size setDefaultRenderer(String.class, new HighlightPatternCellRenderer(EMBEDDED_CHECKSUM)); diff --git a/source/net/filebot/ui/subtitle/SubtitleViewer.java b/source/net/filebot/ui/subtitle/SubtitleViewer.java index f9aeb7de..2aba5332 100644 --- a/source/net/filebot/ui/subtitle/SubtitleViewer.java +++ b/source/net/filebot/ui/subtitle/SubtitleViewer.java @@ -44,9 +44,7 @@ import javax.swing.table.TableRowSorter; import net.filebot.ResourceManager; import net.filebot.subtitle.SubtitleElement; -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;