Skip to content

Commit c696fbf

Browse files
benfrybenfry
committed
starting release 0159, fix some preferences problems, other bug details
1 parent 5f148f2 commit c696fbf

File tree

11 files changed

+172
-118
lines changed

11 files changed

+172
-118
lines changed

‎app/src/processing/app/Base.java‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
* files and images, etc) that comes from that.
4343
*/
4444
public class Base {
45-
static final int VERSION = 158;
46-
static final String VERSION_NAME = "0158 Beta";
45+
static final int VERSION = 159;
46+
static final String VERSION_NAME = "0159 Beta";
4747

4848
static final int[] platforms = new int[] {
4949
PConstants.WINDOWS, PConstants.MACOSX, PConstants.LINUX
@@ -154,22 +154,29 @@ static public void main(String args[]) {
154154

155155
// run static initialization that grabs all the prefs
156156
Preferences.init(null);
157-
157+
158158
// setup the theme coloring fun
159159
Theme.init();
160160

161161
if (Base.isMacOS()) {
162-
String fiasco = "apple.laf.useScreenMenuBar";
163-
String menubar = Preferences.get(fiasco);
164-
if (menubar == null) {
162+
String properMenuBar = "apple.laf.useScreenMenuBar";
163+
String menubar = Preferences.get(properMenuBar);
164+
if (menubar != null) {
165+
// Get the current menu bar setting and use it
166+
System.setProperty(properMenuBar, menubar);
167+
168+
} else {
169+
// 10.4 is not affected, 10.5 (and prolly 10.6) are
165170
if (System.getProperty("os.version").startsWith("10.4")) {
166-
menubar = "true";
167-
Preferences.set(fiasco, menubar);
171+
// Don't bother checking next time
172+
Preferences.set(properMenuBar, "true");
173+
// Also set the menubar now
174+
System.setProperty(properMenuBar, "true");
168175

169176
} else {
170-
// 10.4 is not affected, 10.5 (and prolly 10.6) are
177+
// Running 10.5 or 10.6 or whatever, give 'em the business
171178
String warning =
172-
"<html> " +
179+
"<html>" +
173180
"<head> <style type=\"text/css\">"+
174181
"b { font: 13pt \"Lucida Grande\" }"+
175182
"p { font: 11pt \"Lucida Grande\"; margin-top: 8px }"+
@@ -192,15 +199,16 @@ static public void main(String args[]) {
192199
options[0]);
193200
if (result == -1) {
194201
// They hit ESC or closed the window, so just hide it for now
195-
System.setProperty(fiasco, "false");
196202
// But don't bother setting the preference in the file
197203
} else {
198-
Preferences.set(fiasco, menubar);
204+
// Shut off in the preferences for next time
205+
Preferences.set(properMenuBar, "false");
199206
if (result == 1) { // More Info
200207
Base.openURL("http://dev.processing.org/bugs/show_bug.cgi?id=786");
201208
}
202-
System.setProperty("apple.laf.useScreenMenuBar", "false");
203209
}
210+
// Whether or not canceled, set to false (right now) if we're on 10.5
211+
System.setProperty(properMenuBar, "false");
204212
}
205213
}
206214
}
@@ -1624,14 +1632,14 @@ static public File getContentFile(String name) {
16241632
}
16251633

16261634

1627-
/**
1635+
/**
16281636
* Get an image associated with the current color theme.
16291637
*/
16301638
static public Image getThemeImage(String name, Component who) {
16311639
return getLibImage("theme/" + name, who);
16321640
}
1633-
1634-
1641+
1642+
16351643
/**
16361644
* Return an Image object from inside the Processing lib folder.
16371645
*/

‎app/src/processing/app/EditorToolbar.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6-
Copyright (c) 2004-06 Ben Fry and Casey Reas
6+
Copyright (c) 2004-08 Ben Fry and Casey Reas
77
Copyright (c) 2001-04 Massachusetts Institute of Technology
88
99
This program is free software; you can redistribute it and/or modify
@@ -39,11 +39,12 @@ public class EditorToolbar extends JComponent implements MouseInputListener {
3939
};
4040

4141
static final int BUTTON_COUNT = title.length;
42-
/// height, width of the toolbar buttons
42+
/** Width of each toolbar button. */
4343
static final int BUTTON_WIDTH = 27;
44+
/** Height of each toolbar button. */
4445
static final int BUTTON_HEIGHT = 32;
45-
/// amount of space between groups of buttons on the toolbar
46-
static final int BUTTON_GAP = 15;
46+
/** The amount of space between groups of buttons on the toolbar. */
47+
static final int BUTTON_GAP = 5;
4748

4849
static final int RUN = 0;
4950
static final int STOP = 1;
@@ -92,7 +93,7 @@ public class EditorToolbar extends JComponent implements MouseInputListener {
9293
public EditorToolbar(Editor editor, JMenu menu) {
9394
this.editor = editor;
9495
this.menu = menu;
95-
96+
9697
if (buttons == null) {
9798
buttons = Base.getThemeImage("buttons.gif", this);
9899
}
@@ -145,7 +146,7 @@ public void paintComponent(Graphics screen) {
145146
g.drawImage(buttons, -(i*IMAGE_SIZE) - 3, -0*IMAGE_SIZE, null);
146147
}
147148
}
148-
149+
149150
// this happens once per instance of EditorToolbar
150151
if (stateImage == null) {
151152
state = new int[buttonCount];
@@ -158,7 +159,7 @@ public void paintComponent(Graphics screen) {
158159
x1 = new int[buttonCount];
159160
x2 = new int[buttonCount];
160161
}
161-
162+
162163
Dimension size = getSize();
163164
if ((offscreen == null) ||
164165
(size.width != width) || (size.height != height)) {

‎app/src/processing/app/Sketch.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2000,6 +2000,8 @@ public void itemStateChanged(ItemEvent e) {
20002000
optionPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
20012001
optionPanel.setMaximumSize(goodIdea);
20022002
panel.add(optionPanel);
2003+
2004+
//export.application.stop
20032005

20042006
// JPanel actionPanel = new JPanel();
20052007
// optionPanel.setLayout(new BoxLayout(optionPanel, BoxLayout.X_AXIS));

‎app/src/processing/app/syntax/PdeTextAreaDefaults.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public PdeTextAreaDefaults() {
169169
bgcolor = Theme.getColor("editor.bgcolor");
170170

171171
caretVisible = true;
172-
caretBlinks = Theme.getBoolean("editor.caret.blink");
172+
caretBlinks = Preferences.getBoolean("editor.caret.blink");
173173
caretColor = Theme.getColor("editor.caret.color");
174174

175175
selectionColor = Theme.getColor("editor.selection.color");

‎build/shared/lib/preferences.txt‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,6 @@ editor.external=false
8989
# caret blinking
9090
editor.caret.blink=true
9191

92-
# highlight for the current line
93-
editor.linehighlight=true
94-
95-
# bracket/brace highlighting
96-
editor.brackethighlight=true
97-
98-
# little pooties at the end of lines that show where they finish
99-
editor.eolmarkers=false
100-
10192
# area that's not in use by the text (replaced with tildes)
10293
editor.invalid=false
10394

@@ -173,6 +164,9 @@ export.application.platform.linux = true
173164
# whether or not to export as full screen (present) mode
174165
export.application.fullscreen = false
175166

167+
# whether to show the stop button when exporting to application
168+
export.application.stop = true
169+
176170
# false will place all exported files into a single .jar
177171
export.applet.separate_jar_files = false
178172

‎build/shared/lib/theme/theme.txt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ editor.bgcolor = #ffffff
3939

4040
# highlight for the current line
4141
editor.linehighlight.color=#e2e2e2
42+
# highlight for the current line
43+
editor.linehighlight=true
4244

4345
# caret blinking and caret color
4446
editor.caret.color = #333300
@@ -53,9 +55,11 @@ editor.selection.color = #ffcc00
5355
editor.invalid.style = #7e7e7e,bold
5456

5557
# little pooties at the end of lines that show where they finish
58+
editor.eolmarkers = false
5659
editor.eolmarkers.color = #999999
5760

5861
# bracket/brace highlighting
62+
editor.brackethighlight = true
5963
editor.brackethighlight.color = #006699
6064

6165

@@ -65,10 +69,10 @@ editor.brackethighlight.color = #006699
6569
editor.keyword1.style = #cc6600,plain
6670

6771
# e.g. beginShape, point, line
68-
editor.keyword2.style = #996600,plain
72+
editor.keyword2.style = #cc6600,plain
6973

7074
# e.g. byte, char, short, color
71-
editor.keyword3.style = #996600,bold
75+
editor.keyword3.style = #cc6600,bold
7276

7377

7478
# TEXT - LITERALS

‎build/shared/revisions.txt‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,37 @@ releases will be super crusty.
99

1010
ABOUT REV 0158 - 22 November 2008
1111

12-
Pre-release for 1.0. See done.txt and core/done.txt for information
13-
about changes. More later.
12+
Pre-release for 1.0.
13+
14+
[ changes ]
15+
16+
+ New design for 1.0: new icons, toolbar, colors, etc.
17+
18+
+ Add Export to Application options dialog.
19+
20+
+ Confirm "Do you want to Quit?" and remove the preference for auto-quit.
21+
Was too confusing for users on OS X which would create multiple incrementing
22+
23+
+ Change sketch naming to spell out the current month. Makes it easier to
24+
read, and dropping the year because it's not necessary.
25+
26+
+ Linux and Windows now inlude Java 6 update 10 with the download.
27+
28+
+ All options related to theme (colors,
29+
30+
[ bug fixes ]
31+
32+
+ Clean up some of the new/open code internally.
33+
34+
+ Implement error message regarding the Apple menu bug on Leopard.
35+
Add a preference to toggle the menubar on OS X.
36+
37+
+ Fix OS X dist script to run on Leopard.
38+
39+
documentation
40+
X coloring for CENTER and DIAMETER, turn off coloring for deprecated
41+
X also deal with hint() changes
42+
1443

1544

1645
. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .

‎core/done.txt‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,37 @@
1+
0158 core
2+
X beginShape(TRIANGLE_FAN), and therefore arc(), broken in P2D
3+
X also a typo in the ColorWheel example
4+
X http://dev.processing.org/bugs/show_bug.cgi?id=1019
5+
X P2D - null pointer exception drawing line with alpha stroke
6+
X http://dev.processing.org/bugs/show_bug.cgi?id=1023
7+
X P2D endShape() is working like endShape(CLOSE)
8+
X http://dev.processing.org/bugs/show_bug.cgi?id=1021
9+
X http://dev.processing.org/bugs/show_bug.cgi?id=1028 (mark as dupe)
10+
X arc() center transparent
11+
X http://dev.processing.org/bugs/show_bug.cgi?id=1027
12+
X mark as dupe of bug #200
13+
X but fixed for the P2D case, still afflicts P2D
14+
X P2D - alpha stroke rendered at full opacity
15+
X http://dev.processing.org/bugs/show_bug.cgi?id=1024
16+
X smooth() on single line ellipses not coming out smooth
17+
X sort of works, just not great
18+
X improve (slightly) the quality of ellipse() and arc() with P2D
19+
X don't use TRIANGLE_FAN on ellipseImpl() and arcImpl() with P2D
20+
X split out ellipseImpl and arcImpl from PGraphics into P2D and P3D
21+
X figure out better model for adaptive sizing of circles
22+
X also goes for arcs, though will be weighted based on arc size
23+
X Bring back CENTER_RADIUS but deprecate it
24+
X http://dev.processing.org/bugs/show_bug.cgi?id=1035
25+
X enable smoothing by default in opengl
26+
X change hints to instead only be able to DISABLE 2X or 4X
27+
X bring back .width and .height fields for PShape
28+
o need to update the examples to reflect
29+
X no examples to update
30+
X change reference re: smoothing in opengl
31+
X hint(), smooth(), and size()
32+
X rev the version number
33+
34+
135
0157 core
236
X SVG polygon shapes not drawing since loadShape() and PShape changes
337
X http://dev.processing.org/bugs/show_bug.cgi?id=1005

‎core/todo.txt‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,4 @@
1-
0158 core
2-
X beginShape(TRIANGLE_FAN), and therefore arc(), broken in P2D
3-
X also a typo in the ColorWheel example
4-
X http://dev.processing.org/bugs/show_bug.cgi?id=1019
5-
X P2D - null pointer exception drawing line with alpha stroke
6-
X http://dev.processing.org/bugs/show_bug.cgi?id=1023
7-
X P2D endShape() is working like endShape(CLOSE)
8-
X http://dev.processing.org/bugs/show_bug.cgi?id=1021
9-
X http://dev.processing.org/bugs/show_bug.cgi?id=1028 (mark as dupe)
10-
X arc() center transparent
11-
X http://dev.processing.org/bugs/show_bug.cgi?id=1027
12-
X mark as dupe of bug #200
13-
X but fixed for the P2D case, still afflicts P2D
14-
X P2D - alpha stroke rendered at full opacity
15-
X http://dev.processing.org/bugs/show_bug.cgi?id=1024
16-
X smooth() on single line ellipses not coming out smooth
17-
X sort of works, just not great
18-
X improve (slightly) the quality of ellipse() and arc() with P2D
19-
X don't use TRIANGLE_FAN on ellipseImpl() and arcImpl() with P2D
20-
X split out ellipseImpl and arcImpl from PGraphics into P2D and P3D
21-
X figure out better model for adaptive sizing of circles
22-
X also goes for arcs, though will be weighted based on arc size
23-
X Bring back CENTER_RADIUS but deprecate it
24-
X http://dev.processing.org/bugs/show_bug.cgi?id=1035
25-
X enable smoothing by default in opengl
26-
X change hints to instead only be able to DISABLE 2X or 4X
27-
X bring back .width and .height fields for PShape
28-
o need to update the examples to reflect
29-
X no examples to update
30-
X change reference re: smoothing in opengl
31-
X hint(), smooth(), and size()
32-
X rev the version number
1+
0159 core
332

343

354
_ command line support is currently broken (why?)

‎done.txt‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,51 @@
1+
0158 pde
2+
X missing semicolons - better error message
3+
o http://dev.processing.org/bugs/show_bug.cgi?id=12
4+
o need to highlight the previous line as well (or instead)
5+
X clean up some of the new/open code internally
6+
X export to application options dialog
7+
X implement error message regarding the apple menu bug on leopard
8+
X add a preference to toggle the menubar on osx
9+
X confirm "Do you want to Quit?"
10+
X remove the preference for auto-quit
11+
o tarbell substrate to P2D
12+
X change sketch naming with the dates
13+
X if untitled, and not modified, and closing on macosx (only)
14+
X don't close the sketch and create a new one
15+
X put up dialog box telling the user to use 'quit' or change the preference
16+
X or just automatically quit at that point?
17+
X fix up mkdmg script to work with leopard properly
18+
X even though the error suggests one thing, seems to be something earlier
19+
X need to also detect whether running 10.4 or 10.5
20+
X change ref re: last window closing will prompt re: quit
21+
X quitting will not prompt re: quit
22+
o opengl broken on vista laptop with articulate
23+
o when background() is not called to clear the buffers, causes flashing
24+
o need to disable swapping buffers until background() is used?
25+
o (happens with 0135, 0148 on this machine as well)
26+
o may need to add explicit noBackground() call
27+
X this seems to have fixed itself
28+
X change windows and linux to use jdk 6u10
29+
X pressing run turns up nothing
30+
o (in particular while cpu load is a little higher on g5?)
31+
o http://dev.processing.org/bugs/show_bug.cgi?id=852
32+
o this may just be a macosx (ppc?) bug
33+
o check if platform is MACOSX and font is monospaced (?)
34+
o if so, nuke the setting and change it back to Monaco
35+
X not gonna bother, it's just a few releases
36+
37+
design updates
38+
X update about box in windows app and lib folder
39+
X update icon.gif in the source code
40+
X add in new buttons from casey
41+
X move all editor theme graphics into their own subfolder
42+
o add space between run/stop and the others
43+
44+
documentation
45+
X coloring for CENTER and DIAMETER, turn off coloring for deprecated
46+
X also deal with hint() changes
47+
48+
149
0157 pde
250
X show sketch folder fails for directories containing umlauts
351
X http://dev.processing.org/bugs/show_bug.cgi?id=1010

0 commit comments

Comments
 (0)