From 448910b8d78d823be5002c0639b4fe7d54e93b36 Mon Sep 17 00:00:00 2001 From: Matt Jenkins Date: Thu, 4 Oct 2018 20:38:09 +0100 Subject: [PATCH] Put options and EQ panels in scroll panes --- .../majenko/audiobookrecorder/AudiobookRecorder.java | 2 +- src/uk/co/majenko/audiobookrecorder/Options.java | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java b/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java index c5900ff..5c12d22 100644 --- a/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java +++ b/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java @@ -1839,7 +1839,7 @@ public class AudiobookRecorder extends JFrame { if (equaliserWindow == null) { equaliserWindow = new JDialog(); equaliserWindow.setTitle("Equaliser"); - equaliserWindow.add(book.equaliser); + equaliserWindow.add(new JScrollPane(book.equaliser)); equaliserWindow.pack(); } equaliserWindow.setVisible(true); diff --git a/src/uk/co/majenko/audiobookrecorder/Options.java b/src/uk/co/majenko/audiobookrecorder/Options.java index 0f3b334..d747753 100644 --- a/src/uk/co/majenko/audiobookrecorder/Options.java +++ b/src/uk/co/majenko/audiobookrecorder/Options.java @@ -283,28 +283,20 @@ public class Options extends JDialog { cacheSize = addSpinner(optionsPanel, "Cache size:", 0, 5000, 1, getInteger("cache.size"), ""); addSeparator(optionsPanel); - - tabs.add("Options", optionsPanel); - + tabs.add("Options", new JScrollPane(optionsPanel)); equaliser = new Equaliser(); - for (int i = 0; i < 31; i++) { equaliser.setChannel(i, Options.getFloat("audio.eq." + i)); } - - tabs.add("Default EQ", equaliser); + tabs.add("Default EQ", new JScrollPane(equaliser)); JPanel startScript = new JPanel(); startScript.setLayout(new BorderLayout()); startupScript = new JTextArea(get("scripts.startup")); startScript.add(startupScript, BorderLayout.CENTER); - tabs.add("Startup Script", startScript); - add(tabs, BorderLayout.CENTER); - - setTitle("Options"); setModalityType(Dialog.ModalityType.APPLICATION_MODAL);