From 27736e99b41e3baafd5d16d12c16e3b1391f003f Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Sun, 20 Jun 2004 20:56:31 +0000
Subject: [PATCH] more working on multiple files

---
 processing/app/PdeCode.java                |   3 +++
 processing/app/PdeEditor.java              |   1 +
 processing/app/PdeEditorHeader.java        |  26 +++++++++++----------
 processing/app/PdeSketch.java              |  19 +++++++++++----
 processing/build/shared/lib/buttons.gif    | Bin 1779 -> 1817 bytes
 processing/build/shared/lib/pde.properties |   2 +-
 6 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/processing/app/PdeCode.java b/processing/app/PdeCode.java
index 3c6e0ec3a..96aa0e404 100644
--- a/processing/app/PdeCode.java
+++ b/processing/app/PdeCode.java
@@ -73,6 +73,9 @@ public class PdeCode {
     //history.record(s, PdeHistory.SAVE);
 
     try {
+      System.out.println("saving to " + file);
+      System.out.println("stuff to save: " + program);
+      System.out.println("-------");
       PdeBase.saveFile(program, file);
 
     } catch (Exception e) {
diff --git a/processing/app/PdeEditor.java b/processing/app/PdeEditor.java
index 83af6ca6b..655b2ff33 100644
--- a/processing/app/PdeEditor.java
+++ b/processing/app/PdeEditor.java
@@ -1377,6 +1377,7 @@ public class PdeEditor extends JFrame
       // so that checkModified2 will just do nothing
       checking = 0;
     }
+    message("Done Saving.");
     buttons.clear();      
   }
 
diff --git a/processing/app/PdeEditorHeader.java b/processing/app/PdeEditorHeader.java
index 42951b28b..8284b7f1d 100644
--- a/processing/app/PdeEditorHeader.java
+++ b/processing/app/PdeEditorHeader.java
@@ -369,19 +369,21 @@ public class PdeEditorHeader extends JComponent /*implements MouseListener*/ {
     
     menu.add(unhide);
 
-    menu.addSeparator();
+    if (sketch != null) {
+      menu.addSeparator();
 
-    ActionListener jumpListener = new ActionListener() {
-        public void actionPerformed(ActionEvent e) { 
-          //System.out.println("jump to " + e.getActionCommand());
-          System.out.println("jump to " + e);
-        }
-      };
-    for (int i = 0; i < sketch.codeCount; i++) {
-      item = new JMenuItem(sketch.code[i].name);
-      //item.setActionCommand(files[i]);
-      item.addActionListener(jumpListener);
-      menu.add(item);
+      ActionListener jumpListener = new ActionListener() {
+          public void actionPerformed(ActionEvent e) { 
+            //System.out.println("jump to " + e.getActionCommand());
+            System.out.println("jump to " + e);
+          }
+        };
+      for (int i = 0; i < sketch.codeCount; i++) {
+        item = new JMenuItem(sketch.code[i].name);
+        //item.setActionCommand(files[i]);
+        item.addActionListener(jumpListener);
+        menu.add(item);
+      }
     }
   }
 
diff --git a/processing/app/PdeSketch.java b/processing/app/PdeSketch.java
index b1e22ba9c..c5288e3f0 100644
--- a/processing/app/PdeSketch.java
+++ b/processing/app/PdeSketch.java
@@ -199,9 +199,6 @@ public class PdeSketch {
       }
     }
 
-    // set the main file to be the current tab
-    current = code[0];
-
     // cheap-ass sort of the rest of the files
     // it's a dumb, slow sort, but there shouldn't be more than ~5 files
     for (int i = 1; i < codeCount; i++) {
@@ -217,6 +214,10 @@ public class PdeSketch {
         code[i] = temp;
       }
     }
+
+    // set the main file to be the current tab
+    //current = code[0];
+    setCurrent(0);
   }
 
 
@@ -226,6 +227,7 @@ public class PdeSketch {
   //public void setCurrentModified(boolean what) {
   //public void setModified(boolean what) {
   public void setModified() {
+    System.out.println("setting modified for " + current.program);
     //modified = true;
     current.modified = true;
     //editor.header.repaint();
@@ -261,6 +263,11 @@ public class PdeSketch {
    * Save all code in the current sketch.
    */
   public void save() throws IOException {
+    // get the current text area
+    if (current.modified) {
+      current.program = editor.getText();
+    }
+
     // check if the files are read-only. 
     // if so, need to first do a "save as".
     if (modified && isReadOnly()) {
@@ -272,7 +279,7 @@ public class PdeSketch {
     }
 
     for (int i = 0; i < codeCount; i++) {
-      code[i].save();
+      if (code[i].modified) code[i].save();
     }
     calcModified();
   }
@@ -286,6 +293,8 @@ public class PdeSketch {
 
   public void saveAs() {
     System.err.println("need to save ass here. code not yet finished.");
+
+    // mark all files as modified so that it will save them
   }
 
 
@@ -365,6 +374,8 @@ public class PdeSketch {
 
     // and i'll personally make a note of the change
     //current = which;
+
+    editor.header.rebuild();
   }
 
 
diff --git a/processing/build/shared/lib/buttons.gif b/processing/build/shared/lib/buttons.gif
index af46dfc718302d2580dc6358303c7ba117e09dec..f03ec8f9054bf2a21bdebf0ed6b2c366cadb721a 100644
GIT binary patch
literal 1817
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
H0ssIz+q8-z

literal 1779
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
V_A!ZTUkM+}gvC<!vLr|V06ST9b<+R<

diff --git a/processing/build/shared/lib/pde.properties b/processing/build/shared/lib/pde.properties
index 253b8d9d2..91c6b74c0 100644
--- a/processing/build/shared/lib/pde.properties
+++ b/processing/build/shared/lib/pde.properties
@@ -89,7 +89,7 @@ buttons.status.color = #333322
 
 # settings for the tabs at the top
 # actual tab images are stored in the lib/ folder
-header.bgcolor               = #333322
+header.bgcolor               = #4C4C3E
 header.text.selected.color   = #ffffff
 header.text.unselected.color = #999988
 header.text.font             = SansSerif,plain,12