mirror of
https://github.com/arduino/Arduino.git
synced 2025-02-21 15:54:39 +01:00
Blue! color scheme changed (and hardcoded in source code to ensure consistency with image files).
This commit is contained in:
parent
bbec45d3df
commit
0a15403d7c
@ -106,8 +106,11 @@ public class EditorButtons extends JComponent implements MouseInputListener {
|
|||||||
|
|
||||||
currentRollover = -1;
|
currentRollover = -1;
|
||||||
|
|
||||||
bgcolor = Preferences.getColor("buttons.bgcolor");
|
// hardcoding new blue color scheme for consistency with images,
|
||||||
|
// see EditorStatus.java for details.
|
||||||
|
//bgcolor = Preferences.getColor("buttons.bgcolor");
|
||||||
|
bgcolor = new Color(0x04, 0x4F, 0x6F);
|
||||||
|
|
||||||
status = "";
|
status = "";
|
||||||
|
|
||||||
statusFont = Preferences.getFont("buttons.status.font");
|
statusFont = Preferences.getFont("buttons.status.font");
|
||||||
|
@ -90,8 +90,11 @@ public class EditorHeader extends JComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (backgroundColor == null) {
|
if (backgroundColor == null) {
|
||||||
backgroundColor =
|
//backgroundColor =
|
||||||
Preferences.getColor("header.bgcolor");
|
//Preferences.getColor("header.bgcolor");
|
||||||
|
// hardcoding new blue color scheme for consistency with images,
|
||||||
|
// see EditorStatus.java for details.
|
||||||
|
backgroundColor = new Color(0x21, 0x68, 0x86);
|
||||||
textColor[SELECTED] =
|
textColor[SELECTED] =
|
||||||
Preferences.getColor("header.text.selected.color");
|
Preferences.getColor("header.text.selected.color");
|
||||||
textColor[UNSELECTED] =
|
textColor[UNSELECTED] =
|
||||||
|
@ -52,7 +52,10 @@ public class EditorLineStatus extends JComponent {
|
|||||||
this.textarea = textarea;
|
this.textarea = textarea;
|
||||||
textarea.editorLineStatus = this;
|
textarea.editorLineStatus = this;
|
||||||
|
|
||||||
background = Preferences.getColor("linestatus.bgcolor");
|
// hardcoding new blue color scheme for consistency with images,
|
||||||
|
// see EditorStatus.java for details.
|
||||||
|
//background = Preferences.getColor("linestatus.bgcolor");
|
||||||
|
background = new Color(0x04, 0x4F, 0x6F);
|
||||||
font = Preferences.getFont("linestatus.font");
|
font = Preferences.getFont("linestatus.font");
|
||||||
foreground = Preferences.getColor("linestatus.color");
|
foreground = Preferences.getColor("linestatus.color");
|
||||||
high = Preferences.getInteger("linestatus.height");
|
high = Preferences.getInteger("linestatus.height");
|
||||||
|
@ -76,7 +76,19 @@ public class EditorStatus extends JPanel implements ActionListener {
|
|||||||
|
|
||||||
if (bgcolor == null) {
|
if (bgcolor == null) {
|
||||||
bgcolor = new Color[4];
|
bgcolor = new Color[4];
|
||||||
bgcolor[0] = Preferences.getColor("status.notice.bgcolor");
|
// Arduino 0003 switched to a blue color scheme to visually distinguish
|
||||||
|
// itself from Processing. Because the image files for certain interface
|
||||||
|
// elements (e.g. buttons and tabs) are distributed with the application
|
||||||
|
// while the preference file that specifies the IDE colors is stored in
|
||||||
|
// the user's home directory and shared across all versions of Arduino,
|
||||||
|
// we need to hardcode certain colors here to match the images.
|
||||||
|
// Otherwise, users who used different multiple versions of the software
|
||||||
|
// would sometimes see colors that didn't match the interface elements.
|
||||||
|
// This is a hack and prevents users from customizing the IDE colors,
|
||||||
|
// however, it obviates the need to provide for version-specific
|
||||||
|
// preferences.
|
||||||
|
//bgcolor[0] = Preferences.getColor("status.notice.bgcolor");
|
||||||
|
bgcolor[0] = new Color(0x54, 0x91, 0x9e);
|
||||||
bgcolor[1] = Preferences.getColor("status.error.bgcolor");
|
bgcolor[1] = Preferences.getColor("status.error.bgcolor");
|
||||||
bgcolor[2] = Preferences.getColor("status.prompt.bgcolor");
|
bgcolor[2] = Preferences.getColor("status.prompt.bgcolor");
|
||||||
bgcolor[3] = Preferences.getColor("status.prompt.bgcolor");
|
bgcolor[3] = Preferences.getColor("status.prompt.bgcolor");
|
||||||
|
@ -16,6 +16,11 @@
|
|||||||
|
|
||||||
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||||
|
|
||||||
|
# Some colors have been hardcoded into the source in app/ in order to ensure
|
||||||
|
# consistency with the images distributed and stored with the application.
|
||||||
|
# They have been commented out below so that users who install an old
|
||||||
|
# version of the software will not get incorrect colors left-over from this
|
||||||
|
# config file.
|
||||||
|
|
||||||
# DEFAULT PATHS FOR SKETCHBOOK AND SETTINGS
|
# DEFAULT PATHS FOR SKETCHBOOK AND SETTINGS
|
||||||
|
|
||||||
@ -125,13 +130,13 @@ editor.eolmarkers.color=#99991A
|
|||||||
editor.invalid=false
|
editor.invalid=false
|
||||||
editor.invalid.style=#7E7E00,bold
|
editor.invalid.style=#7E7E00,bold
|
||||||
|
|
||||||
buttons.bgcolor = #044F6F
|
#buttons.bgcolor = #044F6F
|
||||||
buttons.status.font = SansSerif,plain,12
|
buttons.status.font = SansSerif,plain,12
|
||||||
buttons.status.color = #FFFFFF
|
buttons.status.color = #FFFFFF
|
||||||
|
|
||||||
# settings for the tabs at the top
|
# settings for the tabs at the top
|
||||||
# actual tab images are stored in the lib/ folder
|
# actual tab images are stored in the lib/ folder
|
||||||
header.bgcolor = #216886
|
#header.bgcolor = #216886
|
||||||
header.text.selected.color = #1A1A00
|
header.text.selected.color = #1A1A00
|
||||||
header.text.unselected.color = #ffffff
|
header.text.unselected.color = #ffffff
|
||||||
header.text.font = SansSerif,plain,12
|
header.text.font = SansSerif,plain,12
|
||||||
@ -155,7 +160,7 @@ console.auto_clear = true
|
|||||||
console.length = 500
|
console.length = 500
|
||||||
|
|
||||||
status.notice.fgcolor = #ffffff
|
status.notice.fgcolor = #ffffff
|
||||||
status.notice.bgcolor = #54919E
|
#status.notice.bgcolor = #54919E
|
||||||
status.error.fgcolor = #ffffff
|
status.error.fgcolor = #ffffff
|
||||||
status.error.bgcolor = #662000
|
status.error.bgcolor = #662000
|
||||||
status.prompt.fgcolor = #000000
|
status.prompt.fgcolor = #000000
|
||||||
@ -257,7 +262,7 @@ preproc.imports.jdk14 = javax.xml.parsers,javax.xml.transform,javax.xml.transfor
|
|||||||
browser.linux = mozilla
|
browser.linux = mozilla
|
||||||
|
|
||||||
# coloring for the editor line number status bar at the bottom of the screen
|
# coloring for the editor line number status bar at the bottom of the screen
|
||||||
linestatus.bgcolor = #044F6F
|
#linestatus.bgcolor = #044F6F
|
||||||
linestatus.font = SansSerif,plain,10
|
linestatus.font = SansSerif,plain,10
|
||||||
linestatus.color = #ffffff
|
linestatus.color = #ffffff
|
||||||
linestatus.height = 20
|
linestatus.height = 20
|
||||||
|
@ -26,6 +26,8 @@ Now flushing the serial port before uploading (should fix some errors).
|
|||||||
Added a printNewline() function.
|
Added a printNewline() function.
|
||||||
Updated icon of the Windows executable.
|
Updated icon of the Windows executable.
|
||||||
Improved accuracy of the delayMicroseconds() function.
|
Improved accuracy of the delayMicroseconds() function.
|
||||||
|
New blue color scheme and icons courtesy of Noah Shibley (colors are hardcoded
|
||||||
|
into the source to ensure consistency with image files).
|
||||||
|
|
||||||
0002 - 2005.10.05
|
0002 - 2005.10.05
|
||||||
New build process no longer uses makefiles; now controlled by preferences.txt.
|
New build process no longer uses makefiles; now controlled by preferences.txt.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user