From a37724cfe725a1ca120703bc6deb5c1a9c949d4a Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Mon, 2 May 2022 08:46:16 -0400 Subject: [PATCH] put more things into boxes --- .../processing/app/ui/PreferencesFrame.java | 49 ++++++++++++++----- todo.txt | 1 + 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/app/src/processing/app/ui/PreferencesFrame.java b/app/src/processing/app/ui/PreferencesFrame.java index 9e7932dfc..6e2911924 100644 --- a/app/src/processing/app/ui/PreferencesFrame.java +++ b/app/src/processing/app/ui/PreferencesFrame.java @@ -448,6 +448,8 @@ public class PreferencesFrame { addRow(axis, sketchbookLocationLabel, sketchbookLocationField); + // + JPanel layoutPanel = new JPanel(); layoutPanel.setBorder(new TitledBorder("Interface and Fonts")); layoutPanel.setLayout(new BoxLayout(layoutPanel, BoxLayout.Y_AXIS)); @@ -459,23 +461,48 @@ public class PreferencesFrame { addRow(layoutPanel, zoomLabel, zoomAutoBox, zoomSelectionBox, zoomRestartLabel); - axis.add(layoutPanel); - if (Platform.isWindows()) { - addRow(axis, hidpiDisableBox, hidpiRestartLabel); + addRow(layoutPanel, hidpiDisableBox, hidpiRestartLabel); } - addRow(axis, languageLabel, languageSelectionBox, languageRestartLabel); - addRow(axis, inputMethodBox, inputMethodExample, inputRestartLabel); + axis.add(layoutPanel); - addRow(axis, errorCheckerBox, warningsCheckerBox); + // - addRow(axis, codeCompletionBox); - addRow(axis, importSuggestionsBox); + JPanel languagePanel = new JPanel(); + languagePanel.setBorder(new TitledBorder("Language")); + languagePanel.setLayout(new BoxLayout(languagePanel, BoxLayout.Y_AXIS)); - addRow(axis, displayLabel, displaySelectionBox); - addRow(axis, backgroundColorLabel, presentColor); - addRow(axis, memoryOverrideBox, memoryField, mbLabel); + addRow(languagePanel, languageLabel, languageSelectionBox, languageRestartLabel); + addRow(languagePanel, inputMethodBox, inputMethodExample, inputRestartLabel); + + axis.add(languagePanel); + + // + + JPanel codingPanel = new JPanel(); + codingPanel.setBorder(new TitledBorder("Coding")); + codingPanel.setLayout(new BoxLayout(codingPanel, BoxLayout.Y_AXIS)); + + addRow(codingPanel, errorCheckerBox, warningsCheckerBox); + addRow(codingPanel, codeCompletionBox); + addRow(codingPanel, importSuggestionsBox); + + axis.add(codingPanel); + + // + + JPanel runningPanel = new JPanel(); + runningPanel.setBorder(new TitledBorder("Running")); + runningPanel.setLayout(new BoxLayout(runningPanel, BoxLayout.Y_AXIS)); + + addRow(runningPanel, displayLabel, displaySelectionBox); + addRow(runningPanel, backgroundColorLabel, presentColor); + addRow(runningPanel, memoryOverrideBox, memoryField, mbLabel); + + axis.add(runningPanel); + + // addRow(axis, deletePreviousBox); addRow(axis, checkUpdatesBox); diff --git a/todo.txt b/todo.txt index 79e9bb288..32e540b9c 100755 --- a/todo.txt +++ b/todo.txt @@ -91,6 +91,7 @@ _ suggest imports _ increase memory _ move delete previous pref to the Export to Application window _ get rid of the pref/just use the setting from export to app +_ move colons into the language file? contrib X Double-clicking a .pde file also opens an untitled/empty sketch