arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-22 08:22:04 +03:00
Code Activity

Updating colors, toolbar icon, and about image.

Browse Source
This commit is contained in:
David A. Mellis
2010-11-10 10:43:46 -05:00
parent 43092293ec
commit 299b779ca2
14 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/processing/app/Editor.java
View File

@ -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();

20
app/src/processing/app/EditorToolbar.java
View File

@ -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);