Skip to content

Commit a45d76a

Browse files
benfrybenfry
committed
fixing small issues to get things running again
1 parent b9bfc7d commit a45d76a

8 files changed

Lines changed: 44 additions & 18 deletions

File tree

‎app/build.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
<src path="src" />
117117
<src path="generated" />
118118
</javac>
119+
<!--
119120
<javac target="1.5"
120121
srcdir="../android/tool/src"
121122
destdir="bin"
@@ -126,6 +127,7 @@
126127
<copy todir="bin/processing/app/tools/android/data">
127128
<fileset dir="../android/tool/src/processing/app/tools/android/data/" />
128129
</copy>
130+
-->
129131
</target>
130132

131133
<target name="build" depends="compile" description="Build PDE">

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,14 +209,20 @@ public static void initRequirements() {
209209

210210

211211
public Base(String[] args) {
212+
// Get the sketchbook path, and make sure it's set properly
213+
determineSketchbookFolder();
214+
215+
// Make sure ThinkDifferent has library examples too
216+
defaultMode.rebuildLibraryList();
217+
212218
// Put this after loading the examples, so that building the default file
213-
// menu works on Mac OS X (since it needs examplesFolder to be set).
219+
// menu works on Mac OS X (since it needs examplesFolder to be set).
214220
platform.init(this);
215221

216222
toolsFolder = getContentFile("tools");
217223

218-
// Get the sketchbook path, and make sure it's set properly
219-
determineSketchbookFolder();
224+
// // Get the sketchbook path, and make sure it's set properly
225+
// determineSketchbookFolder();
220226

221227
// Check if there were previously opened sketches to be restored
222228
boolean opened = restoreSketches();
@@ -966,10 +972,10 @@ public void run() {
966972
}
967973

968974

969-
protected void rebuildSketchbookMenu() { //JMenu menu) {
970-
//System.out.println("rebuilding sketchbook menu");
971-
//new Exception().printStackTrace();
975+
protected void rebuildSketchbookMenu() {
972976
try {
977+
System.err.println("sketchbook: " + sketchbookFolder);
978+
973979
sketchbookMenu.removeAll();
974980
addSketches(sketchbookMenu, sketchbookFolder, false);
975981
} catch (IOException e) {
@@ -1361,6 +1367,7 @@ protected void determineSketchbookFolder() {
13611367
sketchbookFolder.mkdirs();
13621368
}
13631369
}
1370+
System.err.println("sketchbook: " + sketchbookFolder);
13641371
}
13651372

13661373

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,9 @@ public EditorToolbar(Editor editor, Base base) { //, JMenu menu) {
134134
public Image[][] loadImages() {
135135
// Image allButtons = Base.getThemeImage("buttons.gif", this);
136136
// Image allButtons = Base.loadImage(file);
137-
Image allButtons = mode.loadImage("buttons.gif");
137+
Image allButtons = mode.loadImage("theme/buttons.gif");
138138
int count = allButtons.getWidth(this) / BUTTON_WIDTH;
139+
// System.out.println("width is " + allButtons.getWidth(this));
139140
Image[][] buttonImages = new Image[count][3];
140141

141142
for (int i = 0; i < count; i++) {

‎app/src/processing/app/Mode.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ public File getLibrariesFolder() {
8484

8585

8686
public void rebuildLibraryList() {
87+
System.out.println("rebuildLibraryList()");
88+
8789
// reset the table mapping imports to libraries
8890
importToLibraryTable = new HashMap<String, Library>();
8991

@@ -224,6 +226,7 @@ public void rebuildExamplesMenu(JMenu menu) {
224226
//base.addSketches(menu, examplesFolder, false);
225227

226228
// break down the examples folder for examples
229+
System.out.println("checking examples folder " + examplesFolder);
227230
File[] subfolders = examplesFolder.listFiles(new FilenameFilter() {
228231
public boolean accept(File dir, String name) {
229232
return dir.isDirectory() && name.charAt(0) != '.';

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ public PdeKeywords(File file) throws IOException {
101101
* @param coloring one of KEYWORD1, KEYWORD2, LITERAL1, etc.
102102
*/
103103
public void addColoring(String keyword, String coloring) {
104+
if (keywordColoring == null) {
105+
keywordColoring = new KeywordMap(true);
106+
}
104107
// text will be KEYWORD or LITERAL
105108
boolean isKey = (coloring.charAt(0) == 'K');
106109
// KEYWORD1 -> 0, KEYWORD2 -> 1, etc

‎app/src/processing/mode/java/JavaMode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public JavaMode(Base base, File folder) {
6363
}
6464

6565
try {
66-
theme = new Settings(new File(folder, "theme.txt"));
66+
theme = new Settings(new File(folder, "theme/theme.txt"));
6767
} catch (IOException e) {
6868
Base.showError("Problem loading theme.txt",
6969
"Could not load theme.txt, please re-install Processing", e);

‎build/build.xml‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,38 +104,42 @@
104104
</copy>
105105

106106
<!-- copy shared library folder -->
107-
<copy todir="${target.path}/libraries">
108-
<fileset dir="shared/libraries" />
107+
<copy todir="${target.path}/modes/java/libraries">
108+
<fileset dir="shared/modes/java/libraries" />
109109
</copy>
110110

111111
<!-- copy libraries for dxf, pdf, etc. -->
112-
<copy todir="${target.path}/libraries/dxf">
112+
<copy todir="${target.path}/modes/java/libraries/dxf">
113113
<fileset dir="../dxf" includes="library/**,src/**" />
114114
</copy>
115-
<copy todir="${target.path}/libraries/net">
115+
<copy todir="${target.path}/modes/java/libraries/net">
116116
<fileset dir="../net" includes="library/**,src/**" />
117117
</copy>
118-
<copy todir="${target.path}/libraries/opengl">
118+
<copy todir="${target.path}/modes/java/libraries/opengl">
119119
<fileset dir="../opengl" includes="library/**,src/**" />
120120
</copy>
121-
<copy todir="${target.path}/libraries/pdf">
121+
<copy todir="${target.path}/modes/java/libraries/pdf">
122122
<fileset dir="../pdf" includes="library/**,src/**" />
123123
</copy>
124-
<copy todir="${target.path}/libraries/serial">
124+
<copy todir="${target.path}/modes/java/libraries/serial">
125125
<fileset dir="../serial" includes="library/**,src/**" />
126126
</copy>
127-
<copy todir="${target.path}/libraries/video">
127+
<copy todir="${target.path}/modes/java/libraries/video">
128128
<fileset dir="../video" includes="library/**,src/**" />
129129
</copy>
130130

131131
<!-- Unzip documentation + examples -->
132-
<unzip dest="${target.path}" src="shared/examples.zip" overwrite="false">
132+
<unzip dest="${target.path}/modes/java"
133+
src="shared/modes/java/examples.zip"
134+
overwrite="false">
133135
<patternset>
134136
<exclude name="__MACOSX/**" />
135137
<exclude name="**/._*" />
136138
</patternset>
137139
</unzip>
138-
<unzip dest="${target.path}" src="shared/reference.zip" overwrite="false">
140+
<unzip dest="${target.path}/modes/java"
141+
src="shared/modes/java/reference.zip"
142+
overwrite="false">
139143
<patternset>
140144
<exclude name="__MACOSX/**" />
141145
<exclude name="**/._*" />
@@ -248,6 +252,7 @@
248252

249253
<copy todir="macosx/work/Processing.app/Contents/Resources/Java">
250254
<fileset dir="shared" includes="lib/**" />
255+
<fileset dir="shared" includes="modes/**" />
251256
<fileset file="shared/revisions.txt" />
252257
</copy>
253258

@@ -337,6 +342,7 @@
337342

338343
<copy todir="linux/work">
339344
<fileset dir="shared" includes="lib/**" />
345+
<fileset dir="shared" includes="modes/**" />
340346
<fileset file="shared/revisions.txt" />
341347
</copy>
342348

@@ -448,6 +454,7 @@ http://www.gnu.org/software/tar/manual/html_section/transform.html
448454

449455
<copy todir="windows/work">
450456
<fileset dir="shared" includes="lib/**" />
457+
<fileset dir="shared" includes="modes/**" />
451458
<fileset file="shared/revisions.txt" />
452459
</copy>
453460

‎todo.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ o message(new String(b, offset, length), err, false);
3939
o http://code.google.com/p/processing/issues/detail?id=197
4040
X couldn't find a good way to reproduce this, closing
4141

42+
_ can't do fileMenu.add(base.getSketchbookMenu()); inside ThinkDifferent
43+
_ sketchbook location hasn't been determined yet
44+
4245
_ add splash image on os x
4346
If you want a bundled app to show a splash screen you can do so by adding an entry named SplashFile to the Java section of the Info.plist:
4447
<key>SplashFile</key>

0 commit comments

Comments
 (0)