From c6a78ccd893ebcccc7074d83fb1c9fdf23df6a35 Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Wed, 27 Sep 2006 15:22:43 +0000
Subject: [PATCH] moving tab fwd/back to the editor header

---
 app/Editor.java       | 35 +++++++++--------------------------
 app/EditorHeader.java | 24 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/app/Editor.java b/app/Editor.java
index 94da9e7ab..e08a55d05 100644
--- a/app/Editor.java
+++ b/app/Editor.java
@@ -604,32 +604,6 @@ public class Editor extends JFrame
 
     menu.addSeparator();
 
-    item = newJMenuItem("Previous Tab", '['); //KeyEvent.VK_LEFT);
-    item.addActionListener(new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-          sketch.prevCode();
-        }
-      });
-    menu.add(item);
-
-    item = newJMenuItem("Next Tab", ']'); //KeyEvent.VK_RIGHT);
-    item.addActionListener(new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-          sketch.nextCode();
-        }
-      });
-    menu.add(item);
-
-    menu.addSeparator();
-
-    item = new JMenuItem("Add File...");
-    item.addActionListener(new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-          sketch.addFile();
-        }
-      });
-    menu.add(item);
-
     menu.add(sketchbook.getImportMenu());
 
     if (Base.isWindows() || Base.isMacOS()) {
@@ -644,6 +618,15 @@ public class Editor extends JFrame
       });
       menu.add(item);
     }
+    //menu.addSeparator();
+
+    item = new JMenuItem("Add File...");
+    item.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          sketch.addFile();
+        }
+      });
+    menu.add(item);
 
     // TODO re-enable history
     //history.attachMenu(menu);
diff --git a/app/EditorHeader.java b/app/EditorHeader.java
index 45bcdc84c..5aa16b985 100644
--- a/app/EditorHeader.java
+++ b/app/EditorHeader.java
@@ -238,6 +238,7 @@ public class EditorHeader extends JComponent {
 
 
   public void rebuildMenu() {
+    //System.out.println("rebuilding");
     if (menu != null) {
       menu.removeAll();
 
@@ -245,6 +246,9 @@ public class EditorHeader extends JComponent {
       menu = new JMenu();
       popup = menu.getPopupMenu();
       add(popup);
+      popup.setLightWeightPopupEnabled(true);
+
+      /*
       popup.addPopupMenuListener(new PopupMenuListener() {
           public void popupMenuCanceled(PopupMenuEvent e) {
             // on redraw, the isVisible() will get checked.
@@ -256,6 +260,7 @@ public class EditorHeader extends JComponent {
           public void popupMenuWillBecomeInvisible(PopupMenuEvent e) { }
           public void popupMenuWillBecomeVisible(PopupMenuEvent e) { }
         });
+      */
     }
     JMenuItem item;
 
@@ -347,6 +352,25 @@ public class EditorHeader extends JComponent {
     }
 
     menu.add(unhide);
+    menu.addSeparator();
+
+    //  KeyEvent.VK_LEFT and VK_RIGHT will make Windows beep
+
+    item = Editor.newJMenuItem("Previous Tab", '[', true);
+    item.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          editor.sketch.prevCode();
+        }
+      });
+    menu.add(item);
+
+    item = Editor.newJMenuItem("Next Tab", ']', true);
+    item.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          editor.sketch.nextCode();
+        }
+      });
+    menu.add(item);
 
     if (sketch != null) {
       menu.addSeparator();