rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity

Removing plotting icon from toolbar

Browse Source
This commit is contained in:
Henning Pohl 2015-06-29 12:15:02 +02:00
parent 71f9d67a51
commit 4bd62deba1
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,12 +38,12 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
/** Rollover titles for each button. */
static final String title[] = {
_("Verify"), _("Upload"), _("New"), _("Open"), _("Save"), _("Serial Monitor"), _("Serial Plotter")
_("Verify"), _("Upload"), _("New"), _("Open"), _("Save"), _("Serial Monitor")
};
/** Titles for each button when the shift key is pressed. */
static final String titleShift[] = {
_("Verify"), _("Upload Using Programmer"), _("New"), _("Open in Another Window"), _("Save As..."), _("Serial Monitor"), _("Serial Plotter")
_("Verify"), _("Upload Using Programmer"), _("New"), _("Open in Another Window"), _("Save As..."), _("Serial Monitor")
};
static final int BUTTON_COUNT = title.length;
@ -65,7 +65,6 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
static final int SAVE = 4;
static final int SERIAL = 5;
static final int PLOTTER = 6;
static final int INACTIVE = 0;
static final int ROLLOVER = 1;
@ -111,7 +110,6 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
which[buttonCount++] = OPEN;
which[buttonCount++] = SAVE;
which[buttonCount++] = SERIAL;
which[buttonCount++] = PLOTTER;
currentRollover = -1;
@ -175,11 +173,8 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
}
// Serial button must be on the right
x1[SERIAL] = width - 2 * BUTTON_WIDTH - 14;
x2[SERIAL] = width - BUTTON_WIDTH - 14;
// Plotter button too
x1[PLOTTER] = width - BUTTON_WIDTH - 14;
x2[PLOTTER] = width - 14;
x1[SERIAL] = width - BUTTON_WIDTH - 14;
x2[SERIAL] = width - 14;
}
Graphics g = offscreen.getGraphics();
g.setColor(bgcolor); //getBackground());
@ -206,15 +201,12 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
if (currentRollover != -1) {
int statusY = (BUTTON_HEIGHT + g.getFontMetrics().getAscent()) / 2;
String status = shiftPressed ? titleShift[currentRollover] : title[currentRollover];
switch (currentRollover) {
case SERIAL:
case PLOTTER:
int statusX = x1[SERIAL] - BUTTON_GAP;
statusX -= g.getFontMetrics().stringWidth(status);
g.drawString(status, statusX, statusY);
break;
default:
g.drawString(status, (buttonCount-1) * BUTTON_WIDTH + 3 * BUTTON_GAP, statusY);
if (currentRollover != SERIAL)
g.drawString(status, (buttonCount-1) * BUTTON_WIDTH + 3 * BUTTON_GAP, statusY);
else {
int statusX = x1[SERIAL] - BUTTON_GAP;
statusX -= g.getFontMetrics().stringWidth(status);
g.drawString(status, statusX, statusY);
}
}
@ -364,10 +356,6 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
case SERIAL:
editor.handleSerial();
break;
case PLOTTER:
editor.handlePlotter();
break;
}
}

BIN
build/shared/lib/theme/buttons.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB