From 733ff72e6baf9ec72bcf6dea056eced1a962b4fb Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Thu, 31 Mar 2005 07:03:54 +0000
Subject: [PATCH] new tabs graphics, new colors, horizontally aligned toolbar

---
 processing/app/PdeEditor.java                 |  63 +++++++--
 processing/app/PdeEditorButtons.java          | 126 ++++++++----------
 processing/app/PdeEditorHeader.java           |   3 +-
 processing/app/PdeSketchbook.java             |   3 +-
 processing/build/shared/lib/buttons.gif       | Bin 1817 -> 1539 bytes
 processing/build/shared/lib/preferences.txt   |  20 ++-
 processing/build/shared/lib/tab-sel-left.gif  | Bin 47 -> 55 bytes
 processing/build/shared/lib/tab-sel-menu.gif  | Bin 89 -> 97 bytes
 processing/build/shared/lib/tab-sel-mid.gif   | Bin 46 -> 54 bytes
 processing/build/shared/lib/tab-sel-right.gif | Bin 48 -> 56 bytes
 .../build/shared/lib/tab-unsel-left.gif       | Bin 55 -> 63 bytes
 .../build/shared/lib/tab-unsel-menu.gif       | Bin 92 -> 100 bytes
 processing/build/shared/lib/tab-unsel-mid.gif | Bin 45 -> 53 bytes
 .../build/shared/lib/tab-unsel-right.gif      | Bin 53 -> 61 bytes
 processing/core/PApplet.java                  |   4 +-
 processing/core/todo.txt                      |   7 +
 processing/todo.txt                           |   6 +-
 17 files changed, 139 insertions(+), 93 deletions(-)

diff --git a/processing/app/PdeEditor.java b/processing/app/PdeEditor.java
index e2793c92f..26da24a83 100644
--- a/processing/app/PdeEditor.java
+++ b/processing/app/PdeEditor.java
@@ -76,9 +76,13 @@ public class PdeEditor extends JFrame
   JSplitPane splitPane;
   JPanel consolePanel;
 
+  JLabel lineNumberComponent;
+
   // currently opened program
   public PdeSketch sketch;
 
+  PdeEditorLineStatus lineStatus;
+
   public JEditTextArea textarea;
   PdeEditorListener listener;
 
@@ -171,23 +175,35 @@ public class PdeEditor extends JFrame
     Container pain = getContentPane();
     pain.setLayout(new BorderLayout());
 
-    buttons = new PdeEditorButtons(this);
-    pain.add("West", buttons);
+    Box box = Box.createVerticalBox();
 
-    JPanel rightPanel = new JPanel();
-    rightPanel.setLayout(new BorderLayout());
+    Box upper = Box.createVerticalBox();
+    //JPanel box = new JPanel();
+    //box.setLayout(new FlowLayout(FlowLayout.VERTICAL));
+
+    buttons = new PdeEditorButtons(this);
+    //pain.add("West", buttons);
+    //box.add(buttons);
+    upper.add(buttons);
+
+    //JPanel rightPanel = new JPanel();
+    //rightPanel.setLayout(new BorderLayout());
 
     header = new PdeEditorHeader(this);
-    rightPanel.add(header, BorderLayout.NORTH);
+    //rightPanel.add(header, BorderLayout.NORTH);
+    //box.add(header);
+    upper.add(header);
 
     textarea = new JEditTextArea(new PdeTextAreaDefaults());
     textarea.setRightClickPopup(new TextAreaPopup());
     textarea.setTokenMarker(new PdeKeywords());
 
-    textarea.setHorizontalOffset(5);
+    textarea.setHorizontalOffset(6);
     //textarea.setBorder(new EmptyBorder(0, 20, 0, 0));
     //textarea.setBackground(Color.white);
 
+    //textarea.setMaximumSize(new Dimension(3000, 3000));
+
     // assemble console panel, consisting of status area and the console itself
     consolePanel = new JPanel();
     //System.out.println(consolePanel.getInsets());
@@ -199,13 +215,27 @@ public class PdeEditor extends JFrame
     console = new PdeEditorConsole(this);
     consolePanel.add(console, BorderLayout.CENTER);
 
+    /*
+    lineNumberComponent = new JLabel(" 1234"); //, JLabel.LEFT);
+    lineNumberComponent.setBackground(Color.BLACK);
+    lineNumberComponent.setForeground(Color.WHITE);
+    lineNumberComponent.setFont(new Font("SansSerif", Font.PLAIN, 10));
+    box.add(lineNumberComponent);
+    */
+    lineStatus = new PdeEditorLineStatus(textarea);
+    consolePanel.add(lineStatus, BorderLayout.SOUTH);
+    //box.add(lineStatus);
+
+    upper.add(textarea);
     splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT,
-                               textarea, consolePanel);
+                               upper, consolePanel);
+                               //textarea, consolePanel);
 
     splitPane.setOneTouchExpandable(true);
     // repaint child panes while resizing
     splitPane.setContinuousLayout(true);
-    // if window increases in size, give all of increase to textarea (top pane)
+    // if window increases in size, give all of increase to
+    // the textarea in the uppper pane
     splitPane.setResizeWeight(1D);
 
     // to fix ugliness.. normally macosx java 1.3 puts an
@@ -220,14 +250,25 @@ public class PdeEditor extends JFrame
       splitPane.setDividerSize(dividerSize);
     }
 
-    rightPanel.add(splitPane, BorderLayout.CENTER);
+    splitPane.setMinimumSize(new Dimension(600, 600));
+    //splitPane.setBackground(Color.RED);
+    //splitPane.setMaximumSize(new Dimension(3000, 3000));
+    ///rightPanel.add(splitPane, BorderLayout.CENTER);
+    box.add(splitPane);
 
-    pain.add("Center", rightPanel);
+    //setBackground(Color.green);
+    //box.add(textarea);
+    //box.add(consolePanel);
+
+    //pain.add("Center", rightPanel);
 
     // hopefully these are no longer needed w/ swing
     // (har har har.. that was wishful thinking)
     listener = new PdeEditorListener(this, textarea);
-    textarea.pdeEditorListener = listener;
+    //textarea.editorListener = listener;
+
+    //pain.add("West", box);
+    pain.add(box);
 
     // set the undo stuff for this feller
     Document document = textarea.getDocument();
diff --git a/processing/app/PdeEditorButtons.java b/processing/app/PdeEditorButtons.java
index a5b4fe927..e80c2bfa8 100644
--- a/processing/app/PdeEditorButtons.java
+++ b/processing/app/PdeEditorButtons.java
@@ -35,21 +35,22 @@ import javax.swing.event.*;
 public class PdeEditorButtons extends JComponent implements MouseInputListener {
 
   static final String title[] = {
-    "", "run", "stop", "new", "open", "save", "export"
+    "Run", "Stop", "New", "Open", "Save", "Export"
+    //"run", "stop", "new", "open", "save", "export"
   };
 
   static final int BUTTON_COUNT  = title.length;
-  static final int BUTTON_WIDTH  = PdePreferences.GRID_SIZE;
-  static final int BUTTON_HEIGHT = PdePreferences.GRID_SIZE;
+  static final int BUTTON_WIDTH  = 27; //PdePreferences.GRID_SIZE;
+  static final int BUTTON_HEIGHT = 32; //PdePreferences.GRID_SIZE;
+  static final int BUTTON_GAP = 15; //BUTTON_WIDTH / 2;
 
-  static final int NOTHING  = 0;
-  static final int RUN      = 1;
-  static final int STOP     = 2;
+  static final int RUN      = 0;
+  static final int STOP     = 1;
 
-  static final int NEW      = 3;
-  static final int OPEN     = 4;
-  static final int SAVE     = 5;
-  static final int EXPORT   = 6;
+  static final int NEW      = 2;
+  static final int OPEN     = 3;
+  static final int SAVE     = 4;
+  static final int EXPORT   = 5;
 
   static final int INACTIVE = 0;
   static final int ROLLOVER = 1;
@@ -78,13 +79,13 @@ public class PdeEditorButtons extends JComponent implements MouseInputListener {
   Image stateImage[];
   int which[]; // mapping indices to implementation
 
-  int x1, x2;
-  int y1[], y2[];
+  int x1[], x2[];
+  int y1, y2;
 
   String status;
   Font statusFont;
   Color statusColor;
-  int statusY;
+  //int statusY;
 
 
   public PdeEditorButtons(PdeEditor editor) {
@@ -94,7 +95,7 @@ public class PdeEditorButtons extends JComponent implements MouseInputListener {
     buttonCount = 0;
     which = new int[BUTTON_COUNT];
 
-    which[buttonCount++] = NOTHING;
+    //which[buttonCount++] = NOTHING;
     which[buttonCount++] = RUN;
     which[buttonCount++] = STOP;
     which[buttonCount++] = NEW;
@@ -108,57 +109,36 @@ public class PdeEditorButtons extends JComponent implements MouseInputListener {
 
     status = "";
 
-    //setLayout(null);
-    //status = new JLabel();
     statusFont = PdePreferences.getFont("buttons.status.font");
     statusColor = PdePreferences.getColor("buttons.status.color");
-    //add(status);
 
-    //status.setBounds(-5, BUTTON_COUNT * BUTTON_HEIGHT,
-    //               BUTTON_WIDTH + 15, BUTTON_HEIGHT);
-    //status.setAlignment(Label.CENTER);
-    statusY = (BUTTON_COUNT + 1) * BUTTON_HEIGHT;
+    //statusY = (BUTTON_COUNT + 1) * BUTTON_HEIGHT;
 
     addMouseListener(this);
     addMouseMotionListener(this);
   }
 
 
-  /*
-  public void update() {
-    paint(this.getGraphics());
-  }
-
-  public void update(Graphics g) {
-    paint(g);
-  }
-  */
-
-  //public void paintComponent(Graphics g) {
-  //super.paintComponent(g);
-  //}
-
-
   public void paintComponent(Graphics screen) {
     if (inactive == null) {
       inactive = new Image[BUTTON_COUNT];
       rollover = new Image[BUTTON_COUNT];
       active   = new Image[BUTTON_COUNT];
 
-      //state = new int[BUTTON_COUNT];
+      int IMAGE_SIZE = 33;
 
       for (int i = 0; i < BUTTON_COUNT; i++) {
         inactive[i] = createImage(BUTTON_WIDTH, BUTTON_HEIGHT);
         Graphics g = inactive[i].getGraphics();
-        g.drawImage(buttons, -(i*BUTTON_WIDTH), -2*BUTTON_HEIGHT, null);
+        g.drawImage(buttons, -(i*IMAGE_SIZE) - 3, -2*IMAGE_SIZE, null);
 
         rollover[i] = createImage(BUTTON_WIDTH, BUTTON_HEIGHT);
         g = rollover[i].getGraphics();
-        g.drawImage(buttons, -(i*BUTTON_WIDTH), -1*BUTTON_HEIGHT, null);
+        g.drawImage(buttons, -(i*IMAGE_SIZE) - 3, -1*IMAGE_SIZE, null);
 
         active[i] = createImage(BUTTON_WIDTH, BUTTON_HEIGHT);
         g = active[i].getGraphics();
-        g.drawImage(buttons, -(i*BUTTON_WIDTH), -0*BUTTON_HEIGHT, null);
+        g.drawImage(buttons, -(i*IMAGE_SIZE) - 3, -0*IMAGE_SIZE, null);
       }
 
       state = new int[buttonCount];
@@ -174,17 +154,18 @@ public class PdeEditorButtons extends JComponent implements MouseInputListener {
       width = size.width;
       height = size.height;
 
-      x1 = 0;
-      x2 = BUTTON_WIDTH;
+      y1 = 0;
+      y2 = BUTTON_HEIGHT;
 
-      y1 = new int[buttonCount];
-      y2 = new int[buttonCount];
+      x1 = new int[buttonCount];
+      x2 = new int[buttonCount];
 
-      int offsetY = 0;
+      int offsetX = 3;
       for (int i = 0; i < buttonCount; i++) {
-        y1[i] = offsetY;
-        y2[i] = offsetY + BUTTON_HEIGHT;
-        offsetY = y2[i];
+        x1[i] = offsetX;
+        if (i == 2) x1[i] += BUTTON_GAP;
+        x2[i] = x1[i] + BUTTON_WIDTH;
+        offsetX = x2[i];
       }
     }
     Graphics g = offscreen.getGraphics();
@@ -192,24 +173,24 @@ public class PdeEditorButtons extends JComponent implements MouseInputListener {
     g.fillRect(0, 0, width, height);
 
     for (int i = 0; i < buttonCount; i++) {
-      //g.drawImage(stateImage[i], x1[i], y1, null);
-      g.drawImage(stateImage[i], x1, y1[i], null);
+      g.drawImage(stateImage[i], x1[i], y1, null);
     }
 
     g.setColor(statusColor);
     g.setFont(statusFont);
 
-    // if i ever find the guy who wrote the java2d api,
-    // i will hurt him. or just laugh in his face. or pity him.
+    /*
+    // if i ever find the guy who wrote the java2d api, i will hurt him.
     Graphics2D g2 = (Graphics2D) g;
     FontRenderContext frc = g2.getFontRenderContext();
     float statusW = (float) statusFont.getStringBounds(status, frc).getWidth();
     float statusX = (getSize().width - statusW) / 2;
-
-    //int statusWidth = g.getFontMetrics().stringWidth(status);
-    //int statusX = (getSize().width - statusWidth) / 2;
-
     g2.drawString(status, statusX, statusY);
+    */
+    //int statusY = (BUTTON_HEIGHT + statusFont.getAscent()) / 2;
+    int statusY = (BUTTON_HEIGHT + g.getFontMetrics().getAscent()) / 2;
+    g.drawString(status, buttonCount * BUTTON_WIDTH + 2 * BUTTON_GAP, statusY);
+
     screen.drawImage(offscreen, 0, 0, null);
   }
 
@@ -233,8 +214,8 @@ public class PdeEditorButtons extends JComponent implements MouseInputListener {
 
   public void handleMouse(int x, int y) {
     if (currentRollover != -1) {
-      if ((y > y1[currentRollover]) && (x > x1) &&
-          (y < y2[currentRollover]) && (x < x2)) {
+      if ((x > x1[currentRollover]) && (y > y1) &&
+          (x < x2[currentRollover]) && (y < y2)) {
         return;
 
       } else {
@@ -258,13 +239,12 @@ public class PdeEditorButtons extends JComponent implements MouseInputListener {
   private int findSelection(int x, int y) {
     // if app loads slowly and cursor is near the buttons
     // when it comes up, the app may not have time to load
-    if ((y1 == null) || (y2 == null)) return -1;
+    if ((x1 == null) || (x2 == null)) return -1;
 
     for (int i = 0; i < buttonCount; i++) {
-      if ((x > x1) && (y > y1[i]) &&
-          (x < x2) && (y < y2[i])) {
-        //if ((x > x1[i]) && (y > y1) &&
-        //(x < x2[i]) && (y < y2)) {
+      if ((y > y1) && (x > x1[i]) &&
+          (y < y2) && (x < x2[i])) {
+        //System.out.println("sel is " + i);
         return i;
       }
     }
@@ -301,13 +281,7 @@ public class PdeEditorButtons extends JComponent implements MouseInputListener {
     if (state[OPEN] != INACTIVE) {
       setState(OPEN, INACTIVE, true);
     }
-
-    // kludge
-    //for (int i = 0; i < BUTTON_COUNT; i++) {
-    //messageClear(title[i]);
-    //}
     status = "";
-    //mouseMove(e);
     handleMouse(e.getX(), e.getY());
   }
 
@@ -405,6 +379,7 @@ public class PdeEditorButtons extends JComponent implements MouseInputListener {
     status = msg;
   }
 
+
   public void messageClear(String msg) {
     //if (status.getText().equals(msg + "  ")) status.setText(PdeEditor.EMPTY);
     if (status.equals(msg)) status = "";
@@ -412,6 +387,17 @@ public class PdeEditorButtons extends JComponent implements MouseInputListener {
 
 
   public Dimension getPreferredSize() {
-    return new Dimension(BUTTON_WIDTH, (BUTTON_COUNT + 1)*BUTTON_HEIGHT);
+    return new Dimension((BUTTON_COUNT + 1)*BUTTON_WIDTH, BUTTON_HEIGHT);
+    //return new Dimension(BUTTON_WIDTH, (BUTTON_COUNT + 1)*BUTTON_HEIGHT);
+  }
+
+
+  public Dimension getMinimumSize() {
+    return getPreferredSize();
+  }
+
+
+  public Dimension getMaximumSize() {
+    return new Dimension(3000, BUTTON_HEIGHT);
   }
 }
diff --git a/processing/app/PdeEditorHeader.java b/processing/app/PdeEditorHeader.java
index 59d2e52be..ab63667f2 100644
--- a/processing/app/PdeEditorHeader.java
+++ b/processing/app/PdeEditorHeader.java
@@ -172,7 +172,8 @@ public class PdeEditorHeader extends JComponent {
     hideItem.setEnabled(sketch.current != sketch.code[0]);
 
     //int x = 0; //PdePreferences.GUI_SMALL;
-    int x = (PdeBase.platform == PdeBase.MACOSX) ? 0 : 1;
+    //int x = (PdeBase.platform == PdeBase.MACOSX) ? 0 : 1;
+    int x = 6; // offset from left edge of the component
     for (int i = 0; i < sketch.codeCount; i++) {
       PdeCode code = sketch.code[i];
 
diff --git a/processing/app/PdeSketchbook.java b/processing/app/PdeSketchbook.java
index 953014969..2e4313a43 100644
--- a/processing/app/PdeSketchbook.java
+++ b/processing/app/PdeSketchbook.java
@@ -343,7 +343,8 @@ public class PdeSketchbook {
     // rebuild the popup menu
     menu.removeAll();
 
-    item = new JMenuItem("Open...");
+    //item = new JMenuItem("Open...");
+    item = PdeEditor.newJMenuItem("Open...", 'O', false);
     item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           editor.handleOpen(null);
diff --git a/processing/build/shared/lib/buttons.gif b/processing/build/shared/lib/buttons.gif
index f03ec8f9054bf2a21bdebf0ed6b2c366cadb721a..2771340b99b14cc437ff51a540183a5e872703af 100644
GIT binary patch
literal 1539
zcmV+e2K@O)Nk%w1Va5Ps0HOc@nE(JYGbovvi2uw0W@cId0000000000A^8LV00000
zEC2ui0LB1g000C3NV?qqFv>}*y*TU5yZ>M)j$~<`XsWJk>%MR-&vZ51_#ozZ?f)8{
z&?Dppi%8=n$-GgT%qJ9SnL0C8-6cC*a&yw}RU+<%t(fn&tR=J0YHt~iwu!56c`*>x
z=K_F$RDN7^Q+RQ3fq{K)dxC?GJd1oqhIJ8aZJBv~lzf$4l7EYloI;eQ5PL-c1FmDM
ztWB4Pim8xFqc@+SV1&G-mcY45yEu%E4@kYL%cP~rzq`G~v9hSbqNmV2uCSX9NvX~Z
z%%9~AljP~<(AB!!1J%;k&-2a3^6&L#*z4@#{liC3;5~rW{Ov1fP+YKluOixW_Xu6X
z1?K`zlSj}0+9iz&2R_uc5nIQ01jbpss30TBk_QRGgXu6^zmPGJy~J6QVMK7pM*3oz
zvf|E(>iDfhN)h2uo=Gd}b2JmB%BMtK-eihVsm6~-!{z*=Oe8^X62(TH1f^EnTRyqA
z?6fb7p@iGUVye5B<4Kxp6Y;fm4C^<jP3_tdJgVbRx3qxu)k}DAS<6!;R~`tUv**v?
z<QByNx-`+bb0Fu{j52T`){%p5ru<elV$6WePOf<e_GR9TVH5f7JG1WDz+cO*z2<cD
z+(4pBpH98H_3PNPYv0bjyZ7(l!;2qJzP$PK=+moT&%V9;_wX|am``7Ti2C&7ugA~d
z1AqMg8vG|<e-jL7;CvJuXkda03TQ!t2+9W`1`z(oV1@Nvh+%{hY?z^j4N{2V1s>*C
zV2SpfSR#lcs@NinAy$B5iX9FZz=AH;M~Q<uz8JxZGJ5!+jynzr<9vY_*&~vR@K_^|
zKcaYKj5&THz>O9zd1aGXK8atE1bRsymS0|JVwC)msic@bqRC{FfOP5Rm{x{4C!I;k
z3BiAH9>^x1e%|>emv-(+B%FPI$R<67J|G~N04|y5m}YY5=%a)-$^fR2DmrJKPJY@^
zq+&WoDw@^cXeghcdg=hDnYwx@o~g?EDyx&8x+<-m(uiuUW|H~mpt1UTYnrXv+Q66p
zqbj>8u8Hb8>!HOOJ8QF=E?{G_mLAJ&uiZ|&C8N%23$2>vDgZ0GXa3p?rNRnI?3&{8
z8g04+d<$&2-crjhzsqt;@2dM|tFFMR)=TWY?e02m!AF8?ZNFs>tZ=TuHcT;+3QpNE
zh^FE@qsM{%$*{o(Ln$wnrD6;4vno5>=EZzgI&r`o4w-Y1_I65g!ZKI*v&9>KJT%HM
z3t6ShHz)n@yCO?@w8p~{9rT1+vV67H3S&KWfL`;gbk#<$T=v#yXZ^C+da^xp(Okow
zw%jF?h_v0(>ZkYKeE045-+%`$_~3*WZusGdC$9M7j5qE$;%##f`QtV4yEcRWmx3L0
z*Ky-Kw%K*pcp})Nlej_C+Mb@E>IJgi`hygj4ts#B)Bd`Awc~#K?78#4yX+nQDE#j!
zTi!eH!y_Mj>@qqHFzV{=nXmN3PaplO$NTQ6>&Y{}yRpVsPvgYUTfc1T*b`5__0X@s
z{QKU+55D>6!+(AK_)~xW{hMZgIqEl~TK@LuIjWV<SM#Hv0=L({^bOE~4P2lE37ES1
zr3ir3d!GIHC&2?ouy_dUouWMDL3444gtd!Q(=f=ugF*0x9CV-jx>rI1%CLJKq+kYH
zXrBvikb??jp$>1TzX{T>h7lxU3-f2K5(aRIFyvpjg!sW6evgLPGoKR3qc}b&GEjy+
z1Y#A@r$HRX(2EdU;TXC2KqU6>iLX<k8P}MvwNcT8wnCyBAE-kRqOp&BG~xim_(n0V
zv3*%gBn9_qNIF&zkcu26B7YdkMpAN-SbU@=19{0oZqJ9C{9_b5`N6umQG22!r6A`B
zNmh>1m911I0u!c3T2``%u#Dv^cd1KUrZShS^d&EanK{u(sC1}oUMPv_NLg|ZbGPyj
p`N~H(pmA<)1$<jJg(jiAo$hXw3#T~8NzQVb^PK2RCkYY&06Uz<8?OKW

literal 1817
zcmV+!2j=)kNk%w1Vdns20HOc@GczbmOg?62TA7)M%$WfH|Nj6000000EC2ui0OtT>
z000C37`oj4ZOBQhy*TU5yZ>M)ju>Q~4ymqe>%JQx&vb29Xnw+@4e-FAaNsN6D7s{7
z7&HEu(5S~r#VM}=sf9|@dcQ<&(TYui!(!PPoc3|r$4ObqhO5_Fd$(C5_zD1kcXD$&
z9d12(czJq*89oGlRY-+7d}APuj%%7v8by(zn4dPHG=PGh5|x%1Z6BSB60w&wp^>AH
zGPk!*WULUbaEFk*l5w1xZ^fp_!T`q2s58I7OBIdFrN+6>inV>d;Jdwuq|nj0=Bw7h
zTi@q>-0R+U+S|v@7og?(@95EHOxx7X9R*st@b#;4&)ztI>il7|l`i6@edOkKEBN65
zU${vL<?-r<G26I+5)X>hNbRJ>Krjh%jG&Sk$dW6YF|1Xfr%yB~Cny}bGu{l8MMECV
zw{a$eiOgQ^skfA9&{?N^_8gEZX}yXs8&;Ki(c{rSF;xw4`n2XyvJb@&6R5QS*RCy%
zj%AuxDMh}0slKAbHjCSwI?Em&*08Q!pI3qYC94)^DRFuS6Dkb#Enu;7=gM&0xw6^4
zBu{JhyLxS5!$SEbp30ibl&p>+(-sU7u<6o_GpDIG6L{5|wT-~Sof|Lc-l>fbk87JS
zTh-92i$>0~c~7sFgDds^eK(WWuw$ECt~^8y^3JJq#~xY=`tbGLN3I7SJbmr|$pHw(
zegCy5%X{ScS6YAO6^L0B1Ujf-9dvm&p?dJh!a{@+Ds~2f7B(ndej2L4A$}s_flz?+
zl^DW_g1I=NfHKwyV~zT)hog<J?Wn?vK9+c6kVF>w!jMKLsU!$UF6rbN0z@h0lvGwp
z97h^fDZrCPYU!nw);YDvmr-&VB$;SlSrC+HN@*sJZGNd{J7>f><(nYbsU-(`g1Oms
zU-aoFo*f8!=LT8=kf;EPmKkPoeEJ!Jp<5CfDW#WADMOocT7xK=lTupgn4)H?DGgql
z8s!XBD%$9%>~MyGo*#$`E1Q^pT4fEX>RJS-k79X&poJ!CL$7$)s_Lr$sP5_Oud6aT
z=$~R*kgEn>`haW(%IdnPoZg<ws<YTK3$3KC$y&j++#1U(x$Uw$YqpziJMXT|qC2d)
z$42{Vr@&ZSYPtBntFOTF?ptuZ2d^vcxsDPHF}g5j%PGOF_S-N8-C``Iwi{2du))*D
zD{iaOMjR`kBGdb-y$+AeFqNii4DY=kPkgJw506W8xXfNmEu<~GJM+&t_k488Ngw<2
zp&nC#w8=fgjIgGQ{u}I?9J`z^)JgYQY|f}Iz4O&o-^_EyPlFvcty|OCwb5Uzytddi
z^XfCxck|n}-F<%ytjBl{Eo{*;|Glix;o2Os1YZArcFcw@9w)&6tWeIj*?^;Mrw5yZ
z%(v%$TdjHFRHL3Q%aFUArsbxuEw$T$lT175p92lI;aty+^6O(Wp0^QGzny#3P85G$
zkEibr`rx%HZ9DA1r|$fK%r`H5^vXX^_QcdfZ~Wz2+?a5k($_sa__`ktVfNaCn`QcY
zPwqRhmabfF;A$sJ|Iy)-pQV~Kfa;Z~W7cyYp$OQz?#=If`QrftorJ&$24R9rs-OiW
z2)_+_P(~R1pa|cmt`V9rPXptf+(_lX6EeYm*uq>TNVP8)dI5&ql3^j(^eG!g0f)2F
z;T-BzD<5jmS|hks2wecgb=k0qNJLZ=omeR)cJOT^fTGC%o|r^F2~3J{^HjNNn5Qnv
z;)qT}+pxSy#WogDh-GM34?$<fG1W1LQ#>0Gt9U5;S+Rs1D<T`4w?;dPV2_1-;}r3z
z$1PS7j#x+}9l@B!EiQ6=+q+~SgGk9uDzcJ{<RmCpw?9u#GKQCIWG4lQN+eDWk$IFP
zCsp~zM}{$AqdcW3P5DV)%2JoRv}7-ZiN^+x3T&|anI9o}1x*gqnZ6t*EsI&kRZ0_@
zyqxAUHMyl*brW*Tq(d|d*g0Z4)0@9sWdF7~N^Qb2o7glbIahh2SGF#gxg=-z-YHFO
zN)l?w9Hb}x$;~y|QiWoaCpcRcPj*`KpKcsyG>@6)&V1GqpA8LWJ@JXoR#vl<9qp(`
zg-KA0I+UNR)F06ns?MFERG=R9W<VcG(Tr+Qq6&rSMhjWamp&AtyYy*IO`6l6;*^@C
zTq!$8SJb0Am6*$HDogKI(Wlxpg(^LqLUE|YaxyffQJpGAVfs(#-E;*NyJNA)_|cO(
z^{is8>PVLd$haC+cUhDutb9t=jLMaRb#>@i1Etru-cM3{#47dzD_El5u&`2X>|mdS
zB(L7nMSC@CUpLDo0(Q=_L_A~wV@KI5_RU9dm8=gpu*5E@b+s=tEuPQ_+YYq0wz%a$
H0ssIz+q8-z

diff --git a/processing/build/shared/lib/preferences.txt b/processing/build/shared/lib/preferences.txt
index beff19655..c8c693f84 100755
--- a/processing/build/shared/lib/preferences.txt
+++ b/processing/build/shared/lib/preferences.txt
@@ -116,15 +116,15 @@ editor.eolmarkers.color=#99991A
 editor.invalid=false
 editor.invalid.style=#7E7E00,bold
 
-buttons.bgcolor      = #999988
-buttons.status.font  = SansSerif,plain,10
-buttons.status.color = #333322
+buttons.bgcolor      = #66665A
+buttons.status.font  = SansSerif,plain,12
+buttons.status.color = #FFFFFF
 
 # settings for the tabs at the top
 # actual tab images are stored in the lib/ folder
-header.bgcolor               = #4C4C3E
-header.text.selected.color   = #ffffff
-header.text.unselected.color = #999988
+header.bgcolor               = #999988
+header.text.selected.color   = #1A1A00
+header.text.unselected.color = #ffffff
 header.text.font             = SansSerif,plain,12
 
 console                  = true
@@ -146,7 +146,7 @@ console.auto_clear = true
 console.length = 500
 
 status.notice.fgcolor = #ffffff
-status.notice.bgcolor = #666666
+status.notice.bgcolor = #bbbbaa
 status.error.fgcolor  = #ffffff
 status.error.bgcolor  = #662000
 status.prompt.fgcolor = #000000
@@ -239,3 +239,9 @@ preproc.imports.jdk14 = javax.xml.parsers,javax.xml.transform,javax.xml.transfor
 
 # set the browser to be used on linux
 browser.linux = mozilla
+
+# coloring for the editor line number status bar at the bottom of the screen
+linestatus.bgcolor = #66665a
+linestatus.font	   = SansSerif,plain,10
+linestatus.color   = #ffffff
+linestatus.height  = 20
diff --git a/processing/build/shared/lib/tab-sel-left.gif b/processing/build/shared/lib/tab-sel-left.gif
index 38b1f1e336cdd2082a1d17f44e06e276a4e66e19..55afc0c5b33fd8e743c1750afc52c3b2ea48e603 100644
GIT binary patch
literal 55
zcmZ?wbhEHbWMNQbXkcKNIkRK;?p2CESr|Y-2Sk8m7?}84`d3OO@-CjU<yQCRbF2*3
E0DdzM0{{R3

delta 25
gcmXrl7k2k_v#?BLVNhgfU|{g^u}e#fnkX#;076;?ivR!s

diff --git a/processing/build/shared/lib/tab-sel-menu.gif b/processing/build/shared/lib/tab-sel-menu.gif
index e07c1ed619276eae3c0d2163743b2f81a9c990cd..47041280a2f1f3a3bfa7ac96a68c0869bc8953d7 100644
GIT binary patch
delta 60
zcmaz{G;{ZKv#?AQWKd*iU|`t2d)3UD9g06$7(hS=M1W)%m@InwSDt>$zj%(wjqcBL
Kr!h~|(*^+TO%g8v

delta 52
zcmYd{)N}WAv#?AQWKd*iU|{g^v70%wM~49jKq3rG7A^fNPrv0~Jjdil_vg9O*e9B4
F0{~rB59a^?

diff --git a/processing/build/shared/lib/tab-sel-mid.gif b/processing/build/shared/lib/tab-sel-mid.gif
index e4c6677340909fef5b9d3da8124fcf5f6e3efeca..3b2a9b6743012d76d8481f9e066d6c0af0cfaac9 100644
GIT binary patch
literal 54
zcmZ?wbhEHbWMNQbXkcKNIkRK;?p2CESr|Y-2Sk8m7?^ll`d5m-<zGB!%dPIs+6>kJ
Db7&6c

delta 25
gcmXrh6L$A>v#?BLVNhgfU|{g^u}e#fnkX#|0757QhyVZp

diff --git a/processing/build/shared/lib/tab-sel-right.gif b/processing/build/shared/lib/tab-sel-right.gif
index c5143be72e4978d8a09290506c3285d2056a06d4..a6093c19db39cbaf7bf38ccca0a4b44eaa64814f 100644
GIT binary patch
literal 56
zcmZ?wbhEHbWMNQbXkcKNIkRK;?p2CESr|Y-2Sk8m7?}85`d5l4{+%^v%dPIs_hiHw
FtO1z65GMct

delta 25
gcmcC85O();v#?BLVNhgfU|{g^u}e#fnkX#`078rfjsO4v

diff --git a/processing/build/shared/lib/tab-unsel-left.gif b/processing/build/shared/lib/tab-unsel-left.gif
index 988425f5dfbdb198f012506722eebc1d502b615f..a65d0a4b7d7ce48a81e3f6a49fa83ca1a2e6bf93 100644
GIT binary patch
literal 63
zcmZ?wbhEHbWMNQbXkcL2y?fQnnH`EhSr|Y-2Sk8m7?{L*`d4x$+<Q=%f2)i6>h$Nl
NWe?S-xiK<W0{|FX64w9#

literal 55
zcmZ?wbhEHbWMNQbXkcLQ@v%!wi_&2L0+0v;lUPgtO3B1~4+`^dbunI@{+ze$q53p8
HMh0sDY?Tk<

diff --git a/processing/build/shared/lib/tab-unsel-menu.gif b/processing/build/shared/lib/tab-unsel-menu.gif
index 3c7015b570d22a1570bc0e48e30b3b2eac4e5632..14191969ccb9482473d3fc1f81cf72a9b0c10edc 100644
GIT binary patch
delta 72
zcmaz^adP)`v#?AQWKd*iU|`t2d)3UD9g06$7(hS=M1W)%n5=vHSDt>$zj%(wjqcBL
Wr!jxkjWwF2_-XF(8IoBOt&{-y`xqPm

delta 64
zcmYd^v2yoxv#?AQWKd*iU|{g^v70%wM~49jKq3rG)-C-jPrv0~Jjdil_vg9O*uUz=
R8ckCCH23%nNv(-aN&rl=6_fw~

diff --git a/processing/build/shared/lib/tab-unsel-mid.gif b/processing/build/shared/lib/tab-unsel-mid.gif
index 45ad47091785eee7134fb03e6b4c43f36d08dceb..0590bf7e18711974b3468c054304a91ca9948b47 100644
GIT binary patch
literal 53
zcmZ?wbhEHbWMNQbXkcL2y?fQnnH`EhSr|Y-2Sk8m7?^l^`d6~^axb2<<<@L225SIX
Cs|_^(

literal 45
xcmZ?wbhEHbWMNQbXkcLQ@v%!wi_&2L0+0v;6HiP3N^x24#dEgYn$5*v4FJs(3Q+(6

diff --git a/processing/build/shared/lib/tab-unsel-right.gif b/processing/build/shared/lib/tab-unsel-right.gif
index 118023ae43d7957cc6d52ab3af48f942f204ad00..31b683eb0ce9803fb9142ae4dbbde70c8392f1ee 100644
GIT binary patch
literal 61
zcmZ?wbhEHbWMNQbXkcL2y?fQnnH`EhSr|Y-2Sk8m7??zQ`d6|axHGRXn5|0p-mdHO
L8|SPLWv~VS?eG#t

literal 53
zcmZ?wbhEHbWMNQbXkcLQ@v%!wi_&2L0+0v;lSoVdO7Vkt<`o7rRq5W_b$x#0oE4%B
F)&NKa4^IF9

diff --git a/processing/core/PApplet.java b/processing/core/PApplet.java
index 7db0999be..70a84e645 100644
--- a/processing/core/PApplet.java
+++ b/processing/core/PApplet.java
@@ -532,9 +532,9 @@ public class PApplet extends Applet
       setBounds((winW - width)/2,
                 insets.top + ((winH - insets.top - insets.bottom) - height)/2,
                 winW, winH);
-    } else {
+    //} else {
       //System.out.println("frame was null");
-      setBounds(0, 0, width, height);
+      //setBounds(0, 0, width, height);
     }
   }
 
diff --git a/processing/core/todo.txt b/processing/core/todo.txt
index e2c0e09c6..eed152892 100644
--- a/processing/core/todo.txt
+++ b/processing/core/todo.txt
@@ -1,8 +1,15 @@
 0079 core
 
+_ size() doing a setBounds() is really bad
+_   because it means things can't be embedded properly
+
 _ printarr() of null array crashes without an error
 _ actually, errors from many crashes not coming through on the mac?
 
+_ proper full screen code for present mode
+_   why do mouse motion events go away in full screen mode
+_   or with a Window object
+
 createGraphics and placement issues
 _ make pappletgl work back inside papplet
 _   and then size(300, 300, DEPTH) etc
diff --git a/processing/todo.txt b/processing/todo.txt
index ad4d0b397..ffb541ca7 100644
--- a/processing/todo.txt
+++ b/processing/todo.txt
@@ -1,6 +1,10 @@
 0079 pde
-_ implement horizontal version of PdeEditorButtons
+X add ctrl-o to the open menu
+X implement horizontal version of PdeEditorButtons
 _   http://processing.org/discourse/yabb/YaBB.cgi?board=Proce55ing_Software;action=display;num=1076707944
+X add line numbers
+X add extra space to bottom on osx
+
 
 ...