From 647448d575a5d790c8bdd4267ddf1ad4b51192ea Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Tue, 2 Aug 2022 17:25:39 -0400 Subject: [PATCH] minor visual cleanups --- app/src/processing/app/tools/ThemeSelector.java | 12 ++---------- app/src/processing/app/ui/PreferencesFrame.java | 3 +-- build/shared/lib/theme/theme.txt | 4 ---- todo.txt | 11 +++++++---- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/app/src/processing/app/tools/ThemeSelector.java b/app/src/processing/app/tools/ThemeSelector.java index c2bf7c905..e2d74d37f 100644 --- a/app/src/processing/app/tools/ThemeSelector.java +++ b/app/src/processing/app/tools/ThemeSelector.java @@ -54,7 +54,8 @@ import java.util.Map; public class ThemeSelector extends JFrame implements Tool { - static final String HOWTO_URL = "https://github.com/processing/processing4/wiki/Themes"; + static final String HOWTO_URL = + "https://github.com/processing/processing4/wiki/Themes"; static final String ORDER_FILENAME = "order.txt"; String miniSvgXml; @@ -70,11 +71,8 @@ public class ThemeSelector extends JFrame implements Tool { JComboBox setSelector; ColorfulPanel selector; -// PdeLabel howtoLabel; -// PdeLabel reloadTheme; JLabel howtoLabel; JLabel reloadTheme; -// String labelStyle; Base base; @@ -88,7 +86,6 @@ public class ThemeSelector extends JFrame implements Tool { this.base = base; try { -// File themeFolder = Base.getLibFile("theme"); File themeFolder = Theme.getThemeFolder(); File[] setFolders = themeFolder.listFiles(file -> { if (file.isDirectory()) { @@ -119,7 +116,6 @@ public class ThemeSelector extends JFrame implements Tool { } Container pane = getContentPane(); - //pane.setLayout(new BorderLayout()); Box axis = Box.createVerticalBox(); @@ -133,12 +129,10 @@ public class ThemeSelector extends JFrame implements Tool { updateCurrentIndex(); repaint(); }); - //pane.add(setSelector, BorderLayout.NORTH); addRow(axis, setSelector); axis.add(Box.createVerticalStrut(13)); - //pane.add(selector = new ColorfulPanel(), BorderLayout.CENTER); axis.add(selector = new ColorfulPanel()); // flush with sides axis.add(Box.createVerticalStrut(13)); @@ -194,7 +188,6 @@ public class ThemeSelector extends JFrame implements Tool { } }); - //axis.setBorder(new EmptyBorder(13, 13, 13, 13)); axis.setBorder(new EmptyBorder(20, 20, 20, 20)); pane.add(axis); @@ -222,7 +215,6 @@ public class ThemeSelector extends JFrame implements Tool { public void run() { // location for theme.txt in the sketchbook folder // (doing this in run() in case the sketchbook location has changed) - //sketchbookFile = new File(Base.getSketchbookFolder(), "theme.txt"); sketchbookFile = Theme.getSketchbookFile(); updateTheme(); diff --git a/app/src/processing/app/ui/PreferencesFrame.java b/app/src/processing/app/ui/PreferencesFrame.java index 8a674c61b..8614948fd 100644 --- a/app/src/processing/app/ui/PreferencesFrame.java +++ b/app/src/processing/app/ui/PreferencesFrame.java @@ -504,8 +504,7 @@ public class PreferencesFrame { codingPanel.setLayout(new BoxLayout(codingPanel, BoxLayout.Y_AXIS)); addRow(codingPanel, errorCheckerBox, warningsCheckerBox); - addRow(codingPanel, codeCompletionBox); - addRow(codingPanel, importSuggestionsBox); + addRow(codingPanel, codeCompletionBox, importSuggestionsBox); axis.add(codingPanel); diff --git a/build/shared/lib/theme/theme.txt b/build/shared/lib/theme/theme.txt index 50a71f07b..807c6d7e2 100644 --- a/build/shared/lib/theme/theme.txt +++ b/build/shared/lib/theme/theme.txt @@ -1,7 +1,3 @@ -# The gradient.top and gradient.bottom lines are used by makeGradient(), -# so search for makeGradient() calls to see whether they're still in use. - - ## Look-and-Feel Entries ## laf.mode = light diff --git a/todo.txt b/todo.txt index 51b0ed9bf..e01271017 100755 --- a/todo.txt +++ b/todo.txt @@ -22,6 +22,9 @@ X https://github.com/processing/processing4/issues/524 X Apple Silicon support X https://github.com/processing/processing4/issues/128 X update version of JNA in use +X Update graphics and visual design elements for 4.x +X https://github.com/processing/processing4/issues/48 +X close the interface issue, major changes done bugs X re-post bugzilla entries at https://download.processing.org/bugzilla/ @@ -328,15 +331,15 @@ X sort out hover/press states here (only hovers atm) X also add state for shift-click to search _ theme colors for emoji buttons (new themes across the board) _ naming options? -_ remove underscore and use half space for tabs? +_ remove underscore and use (half?) space for tabs? _ reset the theme because of significant changes _ move away from writing theme.txt? _ instead store the theme name, for easier updating _ and a version in the sketchbook will always override _ (selecting a new theme will rename that file, but not replace a theme.txt file) _ check on text width calculation in the code completion popup -_ close the interface issue, major changes done _ check into offscreen text rendering with JNA +_ https://github.com/iterate-ch/rococoa during release of beta 9 @@ -493,8 +496,6 @@ _ probably not sort by default to avoid confusion design _ code completion icon updates (class, field, protected, method) _ these go into CompletionPanel.java -_ Update graphics and visual design elements for 4.x -_ https://github.com/processing/processing4/issues/48 design/implementation @@ -507,6 +508,8 @@ _ build new welcome/examples screen for startup _ implement document icons on Windows _ implement document icons on Linux _ add notes about params to the wiki +_ the gradient.top and gradient.bottom lines are used by makeGradient(), +_ so search for makeGradient() calls to see whether they're still in use. before 4.x final