Updating colors, toolbar icon, and about image.
@ -618,13 +618,13 @@ public class Editor extends JFrame implements RunnerListener {
|
|||||||
// });
|
// });
|
||||||
// sketchMenu.add(item);
|
// sketchMenu.add(item);
|
||||||
|
|
||||||
item = new JMenuItem("Stop");
|
// item = new JMenuItem("Stop");
|
||||||
item.addActionListener(new ActionListener() {
|
// item.addActionListener(new ActionListener() {
|
||||||
public void actionPerformed(ActionEvent e) {
|
// public void actionPerformed(ActionEvent e) {
|
||||||
handleStop();
|
// handleStop();
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
sketchMenu.add(item);
|
// sketchMenu.add(item);
|
||||||
|
|
||||||
sketchMenu.addSeparator();
|
sketchMenu.addSeparator();
|
||||||
|
|
||||||
@ -1875,12 +1875,12 @@ public class Editor extends JFrame implements RunnerListener {
|
|||||||
* Implements Sketch → Stop, or pressing Stop on the toolbar.
|
* Implements Sketch → Stop, or pressing Stop on the toolbar.
|
||||||
*/
|
*/
|
||||||
public void handleStop() { // called by menu or buttons
|
public void handleStop() { // called by menu or buttons
|
||||||
toolbar.activate(EditorToolbar.STOP);
|
// toolbar.activate(EditorToolbar.STOP);
|
||||||
|
|
||||||
internalCloseRunner();
|
internalCloseRunner();
|
||||||
|
|
||||||
toolbar.deactivate(EditorToolbar.RUN);
|
toolbar.deactivate(EditorToolbar.RUN);
|
||||||
toolbar.deactivate(EditorToolbar.STOP);
|
// toolbar.deactivate(EditorToolbar.STOP);
|
||||||
|
|
||||||
// focus the PDE again after quitting presentation mode [toxi 030903]
|
// focus the PDE again after quitting presentation mode [toxi 030903]
|
||||||
toFront();
|
toFront();
|
||||||
|
@ -37,12 +37,12 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
|
|||||||
|
|
||||||
/** Rollover titles for each button. */
|
/** Rollover titles for each button. */
|
||||||
static final String title[] = {
|
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. */
|
/** Titles for each button when the shift key is pressed. */
|
||||||
static final String titleShift[] = {
|
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;
|
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 RUN = 0;
|
||||||
static final int STOP = 1;
|
static final int EXPORT = 1;
|
||||||
|
|
||||||
static final int NEW = 2;
|
static final int NEW = 2;
|
||||||
static final int OPEN = 3;
|
static final int OPEN = 3;
|
||||||
static final int SAVE = 4;
|
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 INACTIVE = 0;
|
||||||
static final int ROLLOVER = 1;
|
static final int ROLLOVER = 1;
|
||||||
@ -105,11 +104,10 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
|
|||||||
|
|
||||||
//which[buttonCount++] = NOTHING;
|
//which[buttonCount++] = NOTHING;
|
||||||
which[buttonCount++] = RUN;
|
which[buttonCount++] = RUN;
|
||||||
which[buttonCount++] = STOP;
|
which[buttonCount++] = EXPORT;
|
||||||
which[buttonCount++] = NEW;
|
which[buttonCount++] = NEW;
|
||||||
which[buttonCount++] = OPEN;
|
which[buttonCount++] = OPEN;
|
||||||
which[buttonCount++] = SAVE;
|
which[buttonCount++] = SAVE;
|
||||||
which[buttonCount++] = EXPORT;
|
|
||||||
which[buttonCount++] = SERIAL;
|
which[buttonCount++] = SERIAL;
|
||||||
|
|
||||||
currentRollover = -1;
|
currentRollover = -1;
|
||||||
@ -315,10 +313,10 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
|
|||||||
editor.handleRun(e.isShiftDown());
|
editor.handleRun(e.isShiftDown());
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case STOP:
|
// case STOP:
|
||||||
editor.handleStop();
|
// editor.handleStop();
|
||||||
break;
|
// break;
|
||||||
|
//
|
||||||
case OPEN:
|
case OPEN:
|
||||||
popup = menu.getPopupMenu();
|
popup = menu.getPopupMenu();
|
||||||
popup.show(EditorToolbar.this, x, y);
|
popup.show(EditorToolbar.this, x, y);
|
||||||
|
BIN
build/shared/lib/about.jpg
Executable file → Normal file
Before Width: | Height: | Size: 113 KiB After Width: | Height: | Size: 104 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 869 B After Width: | Height: | Size: 73 B |
Before Width: | Height: | Size: 832 B After Width: | Height: | Size: 73 B |
Before Width: | Height: | Size: 891 B After Width: | Height: | Size: 114 B |
Before Width: | Height: | Size: 830 B After Width: | Height: | Size: 54 B |
Before Width: | Height: | Size: 834 B After Width: | Height: | Size: 87 B |
Before Width: | Height: | Size: 844 B After Width: | Height: | Size: 73 B |
Before Width: | Height: | Size: 896 B After Width: | Height: | Size: 114 B |
Before Width: | Height: | Size: 828 B After Width: | Height: | Size: 54 B |
Before Width: | Height: | Size: 842 B After Width: | Height: | Size: 73 B |
@ -1,35 +1,35 @@
|
|||||||
# GUI - STATUS
|
# GUI - STATUS
|
||||||
status.notice.fgcolor = #000000
|
status.notice.fgcolor = #002325
|
||||||
status.notice.bgcolor = #54919e
|
status.notice.bgcolor = #17A1A5
|
||||||
status.error.fgcolor = #ffffff
|
status.error.fgcolor = #FFFFFF
|
||||||
status.error.bgcolor = #662000
|
status.error.bgcolor = #E34C00
|
||||||
status.edit.fgcolor = #000000
|
status.edit.fgcolor = #000000
|
||||||
status.edit.bgcolor = #cc9900
|
status.edit.bgcolor = #F1B500
|
||||||
status.font = SansSerif,plain,12
|
status.font = SansSerif,plain,12
|
||||||
|
|
||||||
# GUI - TABS
|
# GUI - TABS
|
||||||
# settings for the tabs at the top
|
# settings for the tabs at the top
|
||||||
# (tab images are stored in the lib/theme folder)
|
# (tab images are stored in the lib/theme folder)
|
||||||
header.bgcolor = #216886
|
header.bgcolor = #17A1A5
|
||||||
header.text.selected.color = #1a1a00
|
header.text.selected.color = #005B5B
|
||||||
header.text.unselected.color = #ffffff
|
header.text.unselected.color = #007e82
|
||||||
header.text.font = SansSerif,plain,12
|
header.text.font = SansSerif,plain,12
|
||||||
|
|
||||||
# GUI - CONSOLE
|
# GUI - CONSOLE
|
||||||
console.font = Monospaced,plain,11
|
console.font = Monospaced,plain,11
|
||||||
console.font.macosx = Monaco,plain,10
|
console.font.macosx = Monaco,plain,10
|
||||||
console.color = #000000
|
console.color = #000000
|
||||||
console.output.color = #cccccc
|
console.output.color = #eeeeee
|
||||||
console.error.color = #ff3000
|
console.error.color = #E34C00
|
||||||
|
|
||||||
# GUI - BUTTONS
|
# GUI - BUTTONS
|
||||||
buttons.bgcolor = #044f6f
|
buttons.bgcolor = #006468
|
||||||
buttons.status.font = SansSerif,plain,12
|
buttons.status.font = SansSerif,plain,12
|
||||||
buttons.status.color = #ffffff
|
buttons.status.color = #ffffff
|
||||||
|
|
||||||
# GUI - LINESTATUS
|
# GUI - LINESTATUS
|
||||||
linestatus.color = #ffffff
|
linestatus.color = #17A1A5
|
||||||
linestatus.bgcolor = #044f6f
|
linestatus.bgcolor = #006468
|
||||||
|
|
||||||
# EDITOR - DETAILS
|
# EDITOR - DETAILS
|
||||||
|
|
||||||
|