From ea626ecd86374ddae34239d6a5173edf9acedeab Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Mon, 17 Aug 2015 08:34:01 -0400 Subject: [PATCH] remove unnecessary registration, update to style guidelines --- .../contrib/ContributionManagerDialog.java | 51 ++++++++++--------- build/shared/revisions.txt | 7 +++ todo.txt | 44 +++++++++------- 3 files changed, 59 insertions(+), 43 deletions(-) diff --git a/app/src/processing/app/contrib/ContributionManagerDialog.java b/app/src/processing/app/contrib/ContributionManagerDialog.java index 56116e3d1..2bb5c91b4 100644 --- a/app/src/processing/app/contrib/ContributionManagerDialog.java +++ b/app/src/processing/app/contrib/ContributionManagerDialog.java @@ -79,7 +79,7 @@ public class ContributionManagerDialog { public ContributionManagerDialog() { myFont = Toolkit.getSansFont(14, Font.PLAIN); - GraphicsEnvironment.getLocalGraphicsEnvironment().registerFont(myFont); +// GraphicsEnvironment.getLocalGraphicsEnvironment().registerFont(myFont); numberLabel = new JLabel(Toolkit.getLibIcon("manager/notification.png"), SwingConstants.CENTER); toolsContributionTab = new ContributionTab(ContributionType.TOOL, this); librariesContributionTab = new ContributionTab(ContributionType.LIBRARY, this); @@ -107,7 +107,7 @@ public class ContributionManagerDialog { } - public void showFrame(final Editor editor, ContributionType contributionType) { + public void showFrame(Editor editor, ContributionType contributionType) { this.editor = editor; //Calculating index to switch to the required tab @@ -125,12 +125,16 @@ public class ContributionManagerDialog { } if (dialog == null) { makeFrame(editor); - tabbedPane.setSelectedIndex(index); //done before as downloadAndUpdateContributionListing() requires the current selected tab + // done before as downloadAndUpdateContributionListing() + // requires the current selected tab + tabbedPane.setSelectedIndex(index); downloadAndUpdateContributionListing(editor.getBase()); - if(index != 4){ - tabbedPane.getTabComponentAt(tabbedPane.getSelectedIndex()).setBackground(new Color(0xe0fffd)); - tabbedPane.getTabComponentAt(tabbedPane.getSelectedIndex()).setForeground(Color.BLACK); - }else{ + if (index != 4) { + Component selected = + tabbedPane.getTabComponentAt(tabbedPane.getSelectedIndex()); + selected.setBackground(new Color(0xe0fffd)); + selected.setForeground(Color.BLACK); + } else { updateTabPanel.setBackground(new Color(0xe0fffd)); updateTabLabel.setForeground(Color.BLACK); } @@ -256,8 +260,9 @@ public class ContributionManagerDialog { private void makeAndSetTabComponents() { - - String[] tabTitles = { "Tools","Libraries","Modes","Examples","Updates"}; + final String[] tabTitles = { + "Tools", "Libraries", "Modes", "Examples", "Updates" + }; tabLabels = new JLabel[4]; for(int i = 0 ; i < 4; i++){ @@ -266,12 +271,11 @@ public class ContributionManagerDialog { @Override protected void paintComponent(Graphics g) { g.setClip(Toolkit.createRoundRect(0, 0, - getWidth(), getHeight(), - temp == 0 ? 6 : 0, - temp == 3 ? 6 : 0, - 0, 0)); + getWidth(), getHeight(), + temp == 0 ? 6 : 0, + temp == 3 ? 6 : 0, + 0, 0)); super.paintComponent(g); - } }; tabLabels[i].setForeground(Color.WHITE); @@ -284,16 +288,12 @@ public class ContributionManagerDialog { tabbedPane.setTabComponentAt(i, tabLabels[i]); } - updateTabPanel = new JPanel(){ + updateTabPanel = new JPanel() { @Override protected void paintComponent(Graphics g) { - g.setClip(Toolkit.createRoundRect(0, 0, - getWidth(), getHeight(), - 6, - 6, - 0, 0)); + g.setClip(Toolkit.createRoundRect(0, 0, getWidth(), getHeight(), + 6, 6, 0, 0)); super.paintComponent(g); - } };; updateTabLabel = new JLabel("Updates"); @@ -328,21 +328,20 @@ public class ContributionManagerDialog { updateTabPanel.setLayout(tabLayout); tabLayout.setHorizontalGroup(tabLayout .createSequentialGroup() - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE) .addComponent(updateTabLabel) .addComponent(numberLabel) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)); tabLayout.setVerticalGroup(tabLayout .createParallelGroup(GroupLayout.Alignment.CENTER) .addComponent(numberLabel).addComponent(updateTabLabel)); - + numberLabel.setVisible(false); } + // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . @@ -353,7 +352,9 @@ public class ContributionManagerDialog { alfa = 50 + (fila > 7 ? 70 : 10 * fila); } return new Color(0, 0, 0, alfa); - } + } + + @Override protected void installDefaults() { UIManager.put("TabbedPane.selected", Color.BLACK); diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt index 934c4439c..bb6516d53 100644 --- a/build/shared/revisions.txt +++ b/build/shared/revisions.txt @@ -106,6 +106,10 @@ the bugs. See "your contributions are funding graphics fixes," below. https://github.com/processing/processing/issues/3612 https://github.com/processing/processing/pull/3630 ++ Set font correctly in Contribution Manager dialog + https://github.com/processing/processing/issues/3601 + https://github.com/processing/processing/pull/3626 + [ fixed earlier, spring cleaning ] @@ -164,6 +168,9 @@ the bugs. See "your contributions are funding graphics fixes," below. https://github.com/processing/processing/pull/3606 https://github.com/processing/processing/pull/3628 ++ Improve OpenGL extensions checks on OS X + https://github.com/processing/processing/pull/3646 + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . diff --git a/todo.txt b/todo.txt index 2b85f15c4..002f52631 100644 --- a/todo.txt +++ b/todo.txt @@ -18,6 +18,11 @@ X https://github.com/processing/processing/issues/3623 X should Platform be a static instance? X lots of platform stuff in base, but might be better handled elsewhere +jakub +X Parsing generic fails when package is specified (also problem with Map.Entry) +X https://github.com/processing/processing/issues/918 +X https://github.com/processing/processing/pull/3638 + api changes X Make fields and functions in PdeKeywords protected X https://github.com/processing/processing/issues/2383 @@ -55,6 +60,9 @@ X https://github.com/processing/processing/pull/3631 X CM filter input glitchy X https://github.com/processing/processing/issues/3612 X https://github.com/processing/processing/pull/3630 +X Set font correctly in Contribution Manager dialog +X https://github.com/processing/processing/issues/3601 +X https://github.com/processing/processing/pull/3626 earlier X closing the color selector makes things freeze (only Linux and Windows?) @@ -119,7 +127,7 @@ _ Contributions Manager UI design _ https://github.com/processing/processing/issues/3482 _ Ready to add contributed example packages? _ https://github.com/processing/processing/issues/2953 -_ processing-java isn't working in OSX 10.11 El Capitan +_ processing-java isn't working in OS X 10.11 El Capitan _ https://github.com/processing/processing/issues/3497 _ probably have to add the script/Processing.app location to user's path _ move processing-java inside the Java Mode? @@ -129,7 +137,9 @@ _ not really part of the 'build' anymore gui _ fix red in sidebar, the squiggly line beneath code -_ show hover text with 'debug' +_ Error/warning location visualisation not updating when editor resizes +_ https://github.com/processing/processing/issues/3619 +_ show hover text when the mouse is over the 'debug' button _ show number of updates available in the footer _ https://github.com/processing/processing/issues/3518 _ make breakpoints more prominent @@ -148,17 +158,6 @@ _ need 'actively pressed' version of 'play' and 'stop' _ could do rollover as well, but do other apps use them? _ iTunes has no rollover state but has a 'down' state _ swaps to stop after release -_ fonts are still really ugly (on non-retina) -_ may need to drop use of Source Sans -_ what do these do, and are we doing it already? -_ System.setProperty("awt.useSystemAAFontSettings","on"); -_ System.setProperty("swing.aatext", "true"); -_ how are we going to handle fonts for other languages? -_ two new fonts have been added, other languages will need more -_ need a decent sans with with Unicode coverage -_ i.e. https://github.com/processing/processing/pull/3025 -_ Non-western language hint text for toolbar buttons not correctly displayed -_ https://github.com/processing/processing/issues/2886 _ deactivate step, continue, stop when not running? _ update EditorButton rollover label when pressing shift or alt _ disable the debug toggle menu while running @@ -171,8 +170,20 @@ _ show compiling/startup animation after clicking run _ or maybe show an animation for starting up _ rather than post-compile _ https://github.com/processing/processing/issues/136 -_ Error/warning location visualisation not updating when editor resizes -_ https://github.com/processing/processing/issues/3619 + + +fonts +_ fonts are still really ugly (on non-retina) +_ may need to drop use of Source Sans +_ what do these do, and are we doing it already? +_ System.setProperty("awt.useSystemAAFontSettings","on"); +_ System.setProperty("swing.aatext", "true"); +_ how are we going to handle fonts for other languages? +_ two new fonts have been added, other languages will need more +_ need a decent sans with with Unicode coverage +_ i.e. https://github.com/processing/processing/pull/3025 +_ Non-western language hint text for toolbar buttons not correctly displayed +_ https://github.com/processing/processing/issues/2886 pde/build @@ -529,9 +540,6 @@ _ http://www.javalobby.org/java/forums/t19012.html PDE / Compiler & Preprocessor -_ Parsing generic fails when package is specified (also problem with Map.Entry) -_ https://github.com/processing/processing/issues/918 - medium (bugs/features) _ incorporate new preproc _ https://github.com/fjenett/processing-preprocessor-antlr4