add new icon, move theme location, fix another menubar bug

benfry · benfry · commit c4044e868bcc · 2008-11-23T00:31:26.000Z
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -199,8 +199,8 @@ static public void main(String args[]) {
             Base.openURL("http://dev.processing.org/bugs/show_bug.cgi?id=786");
           }
         }
-        System.setProperty("apple.laf.useScreenMenuBar", menubar);
       }
+      System.setProperty("apple.laf.useScreenMenuBar", menubar);
     }
 
     // Set the look and feel before opening the window
@@ -1436,15 +1436,8 @@ static public File selectFolder(String prompt, File folder, Frame frame) {
    * Give this Frame a Processing icon.
    */
   static public void setIcon(Frame frame) {
-    // set the window icon
-    if (icon == null) {
-      try {
-        icon = Base.getLibImage("icon.gif", frame);
-      } catch (Exception e) { } // fail silently, no big whup
-    }
-    if (icon != null) {
-      frame.setIconImage(icon);
-    }
+    Image image = Toolkit.getDefaultToolkit().createImage(PApplet.ICON_IMAGE);
+    frame.setIconImage(image);
   }
 
 
@@ -1629,6 +1622,14 @@ static public File getContentFile(String name) {
   }
 
 
+  /** 
+   * Get an image associated with the current color theme.
+   */
+  static public Image getThemeImage(String name, Component who) {
+    return getLibImage("theme/" + name, who);
+  }
+  
+  
   /**
    * Return an Image object from inside the Processing lib folder.
    */
diff --git a/app/src/processing/app/EditorHeader.java b/app/src/processing/app/EditorHeader.java
@@ -81,8 +81,8 @@ public EditorHeader(Editor eddie) {
       pieces = new Image[STATUS.length][WHERE.length];
       for (int i = 0; i < STATUS.length; i++) {
         for (int j = 0; j < WHERE.length; j++) {
-          pieces[i][j] = Base.getLibImage("tab-" + STATUS[i] + "-" +
-              WHERE[j] + ".gif", this);
+          String path = "theme/tab-" + STATUS[i] + "-" + WHERE[j] + ".gif";
+          pieces[i][j] = Base.getThemeImage(path, this);
         }
       }
     }
diff --git a/app/src/processing/app/EditorLineStatus.java b/app/src/processing/app/EditorLineStatus.java
@@ -55,7 +55,7 @@ public EditorLineStatus(JEditTextArea textarea) {
     high = Preferences.getInteger("linestatus.height");
 
     if (Base.isMacOS()) {
-      resize = Base.getLibImage("resize.gif", this);
+      resize = Base.getThemeImage("resize.gif", this);
     }
     //linestatus.bgcolor = #000000
     //linestatus.font    = SansSerif,plain,10
diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java
@@ -96,7 +96,7 @@ public EditorToolbar(Editor editor, JMenu menu) {  //JPopupMenu popup) {
     this.menu = menu;
     
     if (buttons == null) {
-      buttons = Base.getLibImage("buttons.gif", this);
+      buttons = Base.getThemeImage("buttons.gif", this);
     }
 
     buttonCount = 0;
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -6268,7 +6268,7 @@ public void componentResized(ComponentEvent e) {
   /**
    * GIF image of the Processing logo.
    */
-  static final byte[] ICON_IMAGE = {
+  static public final byte[] ICON_IMAGE = {
     71, 73, 70, 56, 57, 97, 16, 0, 16, 0, -77, 0, 0, 0, 0, 0, -1, -1, -1, 12,
     12, 13, -15, -15, -14, 45, 57, 74, 54, 80, 111, 47, 71, 97, 62, 88, 117,
     1, 14, 27, 7, 41, 73, 15, 52, 85, 2, 31, 55, 4, 54, 94, 18, 69, 109, 37,
diff --git a/todo.txt b/todo.txt
@@ -28,9 +28,9 @@ X   this seems to have fixed itself
 
 design updates
 X update about box in windows app and lib folder
-_ update icon.gif in the source code
-_ add in new buttons from casey
-_ move all editor theme graphics into their own subfolder
+X update icon.gif in the source code
+X add in new buttons from casey
+X move all editor theme graphics into their own subfolder
 _ add space between run/stop and the others
 
 _ change windows and linux to use jdk 6u10

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ public EditorHeader(Editor eddie) {`
`81`	`81`	`pieces = new Image[STATUS.length][WHERE.length];`
`82`	`82`	`for (int i = 0; i < STATUS.length; i++) {`
`83`	`83`	`for (int j = 0; j < WHERE.length; j++) {`
`84`		`- pieces[i][j] = Base.getLibImage("tab-" + STATUS[i] + "-" +`
`85`		`- WHERE[j] + ".gif", this);`
	`84`	`+ String path = "theme/tab-" + STATUS[i] + "-" + WHERE[j] + ".gif";`
	`85`	`+ pieces[i][j] = Base.getThemeImage(path, this);`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public EditorLineStatus(JEditTextArea textarea) {`
`55`	`55`	`high = Preferences.getInteger("linestatus.height");`
`56`	`56`
`57`	`57`	`if (Base.isMacOS()) {`
`58`		`- resize = Base.getLibImage("resize.gif", this);`
	`58`	`+ resize = Base.getThemeImage("resize.gif", this);`
`59`	`59`	`}`
`60`	`60`	`//linestatus.bgcolor = #000000`
`61`	`61`	`//linestatus.font = SansSerif,plain,10`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public EditorToolbar(Editor editor, JMenu menu) { //JPopupMenu popup) {`
`96`	`96`	`this.menu = menu;`
`97`	`97`
`98`	`98`	`if (buttons == null) {`
`99`		`- buttons = Base.getLibImage("buttons.gif", this);`
	`99`	`+ buttons = Base.getThemeImage("buttons.gif", this);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`buttonCount = 0;`