From 0643254e45f9cee3cc83451d37ba076777f33c27 Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Tue, 30 Apr 2013 12:42:46 -0400 Subject: [PATCH] checking on experimental mode --- app/src/processing/app/Mode.java | 6 ++ app/src/processing/app/Settings.java | 7 +- .../mode/experimental/ExperimentalMode.java | 5 +- experimental/theme/tab-sel-left.gif | Bin 62 -> 0 bytes experimental/theme/tab-sel-menu.gif | Bin 104 -> 0 bytes experimental/theme/tab-sel-mid.gif | Bin 54 -> 0 bytes experimental/theme/tab-sel-right.gif | Bin 839 -> 0 bytes experimental/theme/tab-unsel-left.gif | Bin 62 -> 0 bytes experimental/theme/tab-unsel-menu.gif | Bin 104 -> 0 bytes experimental/theme/tab-unsel-mid.gif | Bin 54 -> 0 bytes experimental/theme/tab-unsel-right.gif | Bin 63 -> 0 bytes experimental/theme/theme.txt | 80 ------------------ 12 files changed, 15 insertions(+), 83 deletions(-) delete mode 100755 experimental/theme/tab-sel-left.gif delete mode 100755 experimental/theme/tab-sel-menu.gif delete mode 100755 experimental/theme/tab-sel-mid.gif delete mode 100755 experimental/theme/tab-sel-right.gif delete mode 100755 experimental/theme/tab-unsel-left.gif delete mode 100755 experimental/theme/tab-unsel-menu.gif delete mode 100755 experimental/theme/tab-unsel-mid.gif delete mode 100755 experimental/theme/tab-unsel-right.gif diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java index 2031aa672..23b622714 100644 --- a/app/src/processing/app/Mode.java +++ b/app/src/processing/app/Mode.java @@ -172,6 +172,12 @@ public abstract class Mode { try { //theme = new Settings(new File(folder, "theme/theme.txt")); theme = new Settings(Base.getContentFile("lib/theme.txt")); + + File modeTheme = new File(folder, "theme/theme.txt"); + if (modeTheme.exists()) { + // Override the built-in settings with what the theme provides + theme.load(modeTheme); + } // other things that have to be set explicitly for the defaults theme.setColor("run.window.bgcolor", SystemColor.control); diff --git a/app/src/processing/app/Settings.java b/app/src/processing/app/Settings.java index 1d19dbc41..36beb4135 100644 --- a/app/src/processing/app/Settings.java +++ b/app/src/processing/app/Settings.java @@ -67,7 +67,12 @@ public class Settings { public void load() { - String[] lines = PApplet.loadStrings(file); + load(file); + } + + + public void load(File additions) { + String[] lines = PApplet.loadStrings(additions); for (String line : lines) { if ((line.length() == 0) || (line.charAt(0) == '#')) continue; diff --git a/experimental/src/processing/mode/experimental/ExperimentalMode.java b/experimental/src/processing/mode/experimental/ExperimentalMode.java index 6e2f85fd0..50d7ce4b3 100755 --- a/experimental/src/processing/mode/experimental/ExperimentalMode.java +++ b/experimental/src/processing/mode/experimental/ExperimentalMode.java @@ -29,6 +29,7 @@ import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.Logger; import processing.app.Base; +import processing.app.Editor; import processing.app.EditorState; import processing.app.Mode; import processing.mode.java.JavaMode; @@ -115,7 +116,7 @@ public class ExperimentalMode extends JavaMode { * Create a new editor associated with this mode. */ @Override - public processing.app.Editor createEditor(Base base, String path, EditorState state) { + public Editor createEditor(Base base, String path, EditorState state) { return new DebugEditor(base, path, state, this); } @@ -133,7 +134,7 @@ public class ExperimentalMode extends JavaMode { if (newString != null) { return newString; } - Logger.getLogger(ExperimentalMode.class.getName()).log(Level.WARNING, "Error loading String: {0}", attribute); + Logger.getLogger(getClass().getName()).log(Level.WARNING, "Error loading String: {0}", attribute); return defaultValue; } diff --git a/experimental/theme/tab-sel-left.gif b/experimental/theme/tab-sel-left.gif deleted file mode 100755 index bdee43c25cf2885042d8c024a2712d142adc4599..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62 zcmZ?wbhEHbWMNQbn8?5|W6_$%?x_b(U14Bg&;eowkT?UAcu)UIPNBCgJVxid)^D>Z P=gGS#QJ3^ml))MRD$Nr0 diff --git a/experimental/theme/tab-sel-menu.gif b/experimental/theme/tab-sel-menu.gif deleted file mode 100755 index d926650e7f89c6848bfa20c791498fc1a27804d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmZ?wbhEHb6l73jn8?6z<=PFekhuT<|2K9|Rs6}q00KH70wmACWI3mQ<>|Nli|2&g z=-zy9Pc=_Xq(E1gL)8JU1)9%~tyeq#G~&GE?M2(48*`S-pZ}rbOTe@<%RY13iZC!( F0|4Q)DtQ0^ diff --git a/experimental/theme/tab-sel-mid.gif b/experimental/theme/tab-sel-mid.gif deleted file mode 100755 index fa8ed45fca9a8d515f21f1df03cc1c5f4b03c495..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmZ?wbhEHbWMNQbXkcJy?4Eky)D^{_EDRu^10p~&3{1Q&{VT=a@-LpV$lmI P^W@!=s7rb&%3uuu4}}s| diff --git a/experimental/theme/tab-unsel-menu.gif b/experimental/theme/tab-unsel-menu.gif deleted file mode 100755 index a1720a589caf4697f8f79da5fd1b5b270ded5633..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmZ?wbhEHb6l73jn8?7;F=>uhNZg!d8ydT(D*j|)00A8k0g`86vYgYu^7LE&#dAV# zbZ@@5r<$iGQlKl$q3QtF0?p^g)~g+V8gX9o_M+|2jX6u^&;QWzC1Bc_WuG~1MHm>Y E0YW?|q5uE@ diff --git a/experimental/theme/tab-unsel-mid.gif b/experimental/theme/tab-unsel-mid.gif deleted file mode 100755 index a2c5497b898b4528a8095dc0cf48c6700dd179a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmZ?wbhEHbWMNQbXkcJy?4CMj*#^a*EDRu^10p~&3{1Q&{VT=a@-LpV