diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index 7c0638449..735523e7b 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -618,13 +618,13 @@ public class Editor extends JFrame implements RunnerListener { // }); // sketchMenu.add(item); - item = new JMenuItem("Stop"); - item.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - handleStop(); - } - }); - sketchMenu.add(item); +// item = new JMenuItem("Stop"); +// item.addActionListener(new ActionListener() { +// public void actionPerformed(ActionEvent e) { +// handleStop(); +// } +// }); +// sketchMenu.add(item); sketchMenu.addSeparator(); @@ -1875,12 +1875,12 @@ public class Editor extends JFrame implements RunnerListener { * Implements Sketch → Stop, or pressing Stop on the toolbar. */ public void handleStop() { // called by menu or buttons - toolbar.activate(EditorToolbar.STOP); +// toolbar.activate(EditorToolbar.STOP); internalCloseRunner(); toolbar.deactivate(EditorToolbar.RUN); - toolbar.deactivate(EditorToolbar.STOP); +// toolbar.deactivate(EditorToolbar.STOP); // focus the PDE again after quitting presentation mode [toxi 030903] toFront(); diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java index 74ef71f94..f86fb17c5 100644 --- a/app/src/processing/app/EditorToolbar.java +++ b/app/src/processing/app/EditorToolbar.java @@ -37,12 +37,12 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key /** Rollover titles for each button. */ static final String title[] = { - "Verify", "Stop", "New", "Open", "Save", "Upload", "Serial Monitor" + "Verify", "Upload", "New", "Open", "Save", "Serial Monitor" }; /** Titles for each button when the shift key is pressed. */ static final String titleShift[] = { - "Verify (w/ Verbose Output)", "Stop", "New Editor Window", "Open in Another Window", "Save", "Upload (w/ Verbose Output)", "Serial Monitor" + "Verify (w/ Verbose Output)", "Upload (w/ Verbose Output)", "New Editor Window", "Open in Another Window", "Save", "Serial Monitor" }; static final int BUTTON_COUNT = title.length; @@ -57,14 +57,13 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key static final int RUN = 0; - static final int STOP = 1; + static final int EXPORT = 1; static final int NEW = 2; static final int OPEN = 3; static final int SAVE = 4; - static final int EXPORT = 5; - static final int SERIAL = 6; + static final int SERIAL = 5; static final int INACTIVE = 0; static final int ROLLOVER = 1; @@ -105,11 +104,10 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key //which[buttonCount++] = NOTHING; which[buttonCount++] = RUN; - which[buttonCount++] = STOP; + which[buttonCount++] = EXPORT; which[buttonCount++] = NEW; which[buttonCount++] = OPEN; which[buttonCount++] = SAVE; - which[buttonCount++] = EXPORT; which[buttonCount++] = SERIAL; currentRollover = -1; @@ -315,10 +313,10 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key editor.handleRun(e.isShiftDown()); break; - case STOP: - editor.handleStop(); - break; - +// case STOP: +// editor.handleStop(); +// break; +// case OPEN: popup = menu.getPopupMenu(); popup.show(EditorToolbar.this, x, y); diff --git a/build/shared/lib/about.jpg b/build/shared/lib/about.jpg old mode 100755 new mode 100644 index 90afdb08b..0b168bba1 Binary files a/build/shared/lib/about.jpg and b/build/shared/lib/about.jpg differ diff --git a/build/shared/lib/theme/buttons.gif b/build/shared/lib/theme/buttons.gif index 7cc33ceaf..4de0905d2 100644 Binary files a/build/shared/lib/theme/buttons.gif and b/build/shared/lib/theme/buttons.gif differ diff --git a/build/shared/lib/theme/resize.gif b/build/shared/lib/theme/resize.gif index 59d21d909..ed31c0ad8 100644 Binary files a/build/shared/lib/theme/resize.gif and b/build/shared/lib/theme/resize.gif differ diff --git a/build/shared/lib/theme/tab-sel-left.gif b/build/shared/lib/theme/tab-sel-left.gif index 1fbefecde..252ebcc6d 100644 Binary files a/build/shared/lib/theme/tab-sel-left.gif and b/build/shared/lib/theme/tab-sel-left.gif differ diff --git a/build/shared/lib/theme/tab-sel-menu.gif b/build/shared/lib/theme/tab-sel-menu.gif index eabde568a..3b213f4a7 100644 Binary files a/build/shared/lib/theme/tab-sel-menu.gif and b/build/shared/lib/theme/tab-sel-menu.gif differ diff --git a/build/shared/lib/theme/tab-sel-mid.gif b/build/shared/lib/theme/tab-sel-mid.gif index e6df08890..4bd19a0c3 100644 Binary files a/build/shared/lib/theme/tab-sel-mid.gif and b/build/shared/lib/theme/tab-sel-mid.gif differ diff --git a/build/shared/lib/theme/tab-sel-right.gif b/build/shared/lib/theme/tab-sel-right.gif index be24960a7..4ceb3ed80 100644 Binary files a/build/shared/lib/theme/tab-sel-right.gif and b/build/shared/lib/theme/tab-sel-right.gif differ diff --git a/build/shared/lib/theme/tab-unsel-left.gif b/build/shared/lib/theme/tab-unsel-left.gif index 6ed8391d2..cdc98861f 100644 Binary files a/build/shared/lib/theme/tab-unsel-left.gif and b/build/shared/lib/theme/tab-unsel-left.gif differ diff --git a/build/shared/lib/theme/tab-unsel-menu.gif b/build/shared/lib/theme/tab-unsel-menu.gif index 1587067ae..3c9177118 100644 Binary files a/build/shared/lib/theme/tab-unsel-menu.gif and b/build/shared/lib/theme/tab-unsel-menu.gif differ diff --git a/build/shared/lib/theme/tab-unsel-mid.gif b/build/shared/lib/theme/tab-unsel-mid.gif index f1adaa675..c538ad2fe 100644 Binary files a/build/shared/lib/theme/tab-unsel-mid.gif and b/build/shared/lib/theme/tab-unsel-mid.gif differ diff --git a/build/shared/lib/theme/tab-unsel-right.gif b/build/shared/lib/theme/tab-unsel-right.gif index 1086fb309..3150eb5ea 100644 Binary files a/build/shared/lib/theme/tab-unsel-right.gif and b/build/shared/lib/theme/tab-unsel-right.gif differ diff --git a/build/shared/lib/theme/theme.txt b/build/shared/lib/theme/theme.txt index d3404179c..a0889e64a 100644 --- a/build/shared/lib/theme/theme.txt +++ b/build/shared/lib/theme/theme.txt @@ -1,35 +1,35 @@ # GUI - STATUS -status.notice.fgcolor = #000000 -status.notice.bgcolor = #54919e -status.error.fgcolor = #ffffff -status.error.bgcolor = #662000 +status.notice.fgcolor = #002325 +status.notice.bgcolor = #17A1A5 +status.error.fgcolor = #FFFFFF +status.error.bgcolor = #E34C00 status.edit.fgcolor = #000000 -status.edit.bgcolor = #cc9900 +status.edit.bgcolor = #F1B500 status.font = SansSerif,plain,12 # GUI - TABS # settings for the tabs at the top # (tab images are stored in the lib/theme folder) -header.bgcolor = #216886 -header.text.selected.color = #1a1a00 -header.text.unselected.color = #ffffff +header.bgcolor = #17A1A5 +header.text.selected.color = #005B5B +header.text.unselected.color = #007e82 header.text.font = SansSerif,plain,12 # GUI - CONSOLE console.font = Monospaced,plain,11 console.font.macosx = Monaco,plain,10 console.color = #000000 -console.output.color = #cccccc -console.error.color = #ff3000 +console.output.color = #eeeeee +console.error.color = #E34C00 # GUI - BUTTONS -buttons.bgcolor = #044f6f +buttons.bgcolor = #006468 buttons.status.font = SansSerif,plain,12 buttons.status.color = #ffffff -# GUI - LINESTATUS -linestatus.color = #ffffff -linestatus.bgcolor = #044f6f +# GUI - LINESTATUS +linestatus.color = #17A1A5 +linestatus.bgcolor = #006468 # EDITOR - DETAILS