clean up editor toolbar button code a bit, add new messages when shift is pressed

benfry · benfry · commit 43c41bf060cd · 2009-12-13T00:48:46.000Z
diff --git a/android/todo.txt b/android/todo.txt
@@ -2,6 +2,7 @@
 X fix problem with windows claiming "does not appear to contain an Android SDK"
 X add methods to request rendering
 _   need to deal with fps problems with this model
+_ check on multiple pointers work (peter's msg)
 
 
 P1 this is embarrassing, need to fix ASAP
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -890,7 +890,8 @@ public void actionPerformed(ActionEvent e) {
 
     // Add a list of all sketches and subfolders
     try {
-      boolean sketches = addSketches(menu, getSketchbookFolder(), true);
+      //boolean sketches = addSketches(menu, getSketchbookFolder(), true);
+      boolean sketches = addSketches(menu, getSketchbookFolder());
       if (sketches) menu.addSeparator();
     } catch (IOException e) {
       e.printStackTrace();
@@ -899,7 +900,8 @@ public void actionPerformed(ActionEvent e) {
     //System.out.println("rebuilding examples menu");
     // Add each of the subfolders of examples directly to the menu
     try {
-      addSketches(menu, examplesFolder, true);
+      //addSketches(menu, examplesFolder, true);
+      addSketches(menu, examplesFolder);
     } catch (IOException e) {
       e.printStackTrace();
     }
@@ -911,7 +913,8 @@ protected void rebuildSketchbookMenu(JMenu menu) {
     //new Exception().printStackTrace();
     try {
       menu.removeAll();
-      addSketches(menu, getSketchbookFolder(), false);
+      //addSketches(menu, getSketchbookFolder(), false);
+      addSketches(menu, getSketchbookFolder());
     } catch (IOException e) {
       e.printStackTrace();
     }
@@ -952,7 +955,8 @@ public void rebuildExamplesMenu(JMenu menu) {
     //System.out.println("rebuilding examples menu");
     try {
       menu.removeAll();
-      addSketches(menu, examplesFolder, false);
+      //addSketches(menu, examplesFolder, false);
+      addSketches(menu, examplesFolder);
     } catch (IOException e) {
       e.printStackTrace();
     }
@@ -965,8 +969,7 @@ public void rebuildExamplesMenu(JMenu menu) {
    * should replace the sketch in the current window, or false when the
    * sketch should open in a new window.
    */
-  protected boolean addSketches(JMenu menu, File folder,
-                                final boolean openReplaces) throws IOException {
+  protected boolean addSketches(JMenu menu, File folder) throws IOException {
     // skip .DS_Store files, etc (this shouldn't actually be necessary)
     if (!folder.isDirectory()) return false;
 
@@ -983,7 +986,8 @@ protected boolean addSketches(JMenu menu, File folder,
         public void actionPerformed(ActionEvent e) {
           String path = e.getActionCommand();
           if (new File(path).exists()) {
-            if (openReplaces) {
+//            if (openReplaces) {
+            if ((e.getModifiers() & ActionEvent.SHIFT_MASK) == 0) {
               handleOpenReplace(path);
             } else {
               handleOpen(path);
@@ -1038,7 +1042,8 @@ public void actionPerformed(ActionEvent e) {
         JMenu submenu = new JMenu(list[i]);
         // needs to be separate var
         // otherwise would set ifound to false
-        boolean found = addSketches(submenu, subfolder, openReplaces); //, false);
+        //boolean found = addSketches(submenu, subfolder, openReplaces); //, false);
+        boolean found = addSketches(submenu, subfolder); //, false);
         if (found) {
           menu.add(submenu);
           ifound = true;
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
@@ -246,6 +246,9 @@ public void windowDeactivated(WindowEvent e) {
     // (har har har.. that was wishful thinking)
     listener = new EditorListener(this, textarea);
     pain.add(box);
+    
+    // get shift down/up events so we can show the alt version of toolbar buttons
+    textarea.addKeyListener(toolbar);
 
     pain.setTransferHandler(new FileDropHandler());
 
diff --git a/app/src/processing/app/EditorListener.java b/app/src/processing/app/EditorListener.java
@@ -103,6 +103,10 @@ public boolean keyPressed(KeyEvent event) {
     char c = event.getKeyChar();
     int code = event.getKeyCode();
 
+//    if (code == KeyEvent.VK_SHIFT) {
+//      editor.toolbar.setShiftPressed(true);
+//    }
+
     //System.out.println((int)c + " " + code + " " + event);
     //System.out.println();
 
@@ -455,6 +459,13 @@ public boolean keyPressed(KeyEvent event) {
     }
     return false;
   }
+  
+  
+//  public boolean keyReleased(KeyEvent event) {
+//    if (code == KeyEvent.VK_SHIFT) {
+//      editor.toolbar.setShiftPressed(false);
+//    }
+//  }
 
 
   public boolean keyTyped(KeyEvent event) {
diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java
diff --git a/todo.txt b/todo.txt
