Merge branch 'master' of https://github.com/processing/processing

app/src/processing/app/ui/EditorStatus.java

@@ -3,7 +3,8 @@
 /*
   Part of the Processing project - http://processing.org
 
-  Copyright (c) 2004-10 Ben Fry and Casey Reas
+  Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
   Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This program is free software; you can redistribute it and/or modify
@@ -43,9 +44,9 @@ public class EditorStatus extends BasicSplitPaneDivider {  //JPanel {
   static final int LEFT_MARGIN = Editor.LEFT_GUTTER;
   static final int RIGHT_MARGIN = 20;
 
-
-  Color[] bgcolor;
-  Color[] fgcolor;
+  Color[] fgColor;
+  Color[] bgColor;
+  Image[] bgImage;
 
   @SuppressWarnings("hiding")
   static public final int ERROR   = 1;
@@ -116,16 +117,23 @@ public class EditorStatus extends BasicSplitPaneDivider {  //JPanel {
 
   public void updateMode() {
     Mode mode = editor.getMode();
-    bgcolor = new Color[] {
-      mode.getColor("status.notice.bgcolor"),
-      mode.getColor("status.error.bgcolor"),
-      mode.getColor("status.edit.bgcolor")
-    };
 
-    fgcolor = new Color[] {
+    fgColor = new Color[] {
       mode.getColor("status.notice.fgcolor"),
       mode.getColor("status.error.fgcolor"),
-      mode.getColor("status.edit.fgcolor")
+      mode.getColor("status.warning.fgcolor")
+    };
+
+    bgColor = new Color[] {
+      mode.getColor("status.notice.bgcolor"),
+      mode.getColor("status.error.bgcolor"),
+      mode.getColor("status.warning.bgcolor")
+    };
+
+    bgImage = new Image[] {
+      mode.loadImage("/lib/status/notice.png"),
+      mode.loadImage("/lib/status/error.png"),
+      mode.loadImage("/lib/status/edit.png")
     };
 
     font = mode.getFont("status.font");
@@ -236,10 +244,11 @@ public class EditorStatus extends BasicSplitPaneDivider {  //JPanel {
       ascent = metrics.getAscent();
     }
 
-    g.setColor(bgcolor[mode]);
-    g.fillRect(0, 0, sizeW, sizeH);
+    //g.setColor(bgColor[mode]);
+    //g.fillRect(0, 0, sizeW, sizeH);
+    g.drawImage(bgImage[mode], 0, 0, sizeW, sizeH, this);
 
-    g.setColor(fgcolor[mode]);
+    g.setColor(fgColor[mode]);
     // https://github.com/processing/processing/issues/3265
     if (message != null) {
       g.setFont(font); // needs to be set each time on osx

build/shared/lib/theme.txt

@@ -4,8 +4,6 @@ status.notice.fgcolor = #000000
 status.notice.bgcolor = #818b95
 status.error.fgcolor = #ffffff
 status.error.bgcolor = #9E0A0A
-#status.edit.fgcolor = #000000
-#status.edit.bgcolor = #cc9900
 status.warning.bgcolor = #EF8115
 status.warning.fgcolor = #FFFFFF
 status.font = processing.sans,plain,13

core/todo.txt

@@ -18,6 +18,7 @@ X   https://github.com/processing/processing/pull/3893
 X   https://github.com/processing/processing/issues/3865
 X OpenGL with fullScreen() always opens on default display
 X   https://github.com/processing/processing/issues/3889
+X   https://github.com/processing/processing/issues/3797
 X   https://github.com/processing/processing/pull/3892
 
 cleaning

todo.txt

@@ -45,12 +45,17 @@ _ new Android release (EditorButton constructor changed)
 3.0 final
 _ https://github.com/processing/processing/milestones/3.0%20final
 X clean up statusMessage() inside JavaEditor
-_   do we want to bring back the delays?
+o   do we want to bring back the delays?
+_ gradient on editor is not working
 _ JavaEditor has several null colors, remove color support
 _   once the design is complete and we for sure do not need color
 _ grab bag of CM work from Jakub
 _   https://github.com/processing/processing/issues/3895
 X   https://github.com/processing/processing/pull/3897
+_ error list tab
+_   when moving away from an error/warning line, de-select it below
+_   selecting a warning should also show the warning in the status area
+_   clicking an error or warning should give the focus back to the editor
 
 gui / James
 _ Fix placement and visual design when showing error on hover
@@ -73,6 +78,7 @@ _   https://github.com/processing/processing/issues/3855
 _ show number of updates available in the footer
 _   https://github.com/processing/processing/issues/3518
 X   https://github.com/processing/processing/pull/3896
+X   https://github.com/processing/processing/pull/3901
 _   and have it be clickable so to open the manager
 _   total number of updates available is not correct? (may be fixed)
 _ ugly white gap at the top of scroll bar