Skip to content

Fix unneeded "Select port on upload" message #8194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Nov 14, 2018
Merged

Fix unneeded "Select port on upload" message #8194

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
205ce59
Removed dead-code in comments
cmaglie Nov 9, 2018
eefe8dd
Refactor: simplified TargetBoard retrieve
cmaglie Nov 9, 2018
0310ec1
Refactor: simplified bool prefs retrieval
cmaglie Nov 9, 2018
aebdba2
Refactor: removed useless parameter from StringReplacer.formatAndSplit
cmaglie Nov 9, 2018
6ea66ea
Refactor: Removed code duplication in Export(App)Handlers
cmaglie Nov 9, 2018
2cf63e7
Added StringReplacer.checkIfRequiredKeyIsMissingOrExcept helper method
cmaglie Nov 9, 2018
459c173
Fix 'Select port on upload' error message
cmaglie Nov 9, 2018
89ff7b2
Show port on status bar only when selected
cmaglie Nov 9, 2018
d903d6b
Nicer serial port selection dialog box
cmaglie Nov 9, 2018
c1c8d5f
Editor: the serial port selection dialog now works
cmaglie Nov 12, 2018
13e72be
Editor: fixed port ordering in tools menu
cmaglie Nov 12, 2018
d99a31c
Better error for 'no serial ports available'
cmaglie Nov 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions app/src/processing/app/EditorLineStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,17 @@ public void paintComponent(Graphics graphics) {
g.drawString(text, scale(6), baseline);

g.setColor(messageForeground);
String tmp = I18n.format(tr("{0} on {1}"), name, serialport);

Rectangle2D bounds = g.getFontMetrics().getStringBounds(tmp, null);

g.drawString(tmp, size.width - (int) bounds.getWidth() - RESIZE_IMAGE_SIZE,

String statusText;
if (serialport != null && !serialport.isEmpty()) {
statusText = I18n.format(tr("{0} on {1}"), name, serialport);
} else {
statusText = name;
}

Rectangle2D bounds = g.getFontMetrics().getStringBounds(statusText, null);

g.drawString(statusText, size.width - (int) bounds.getWidth() - RESIZE_IMAGE_SIZE,
baseline);

if (OSUtils.isMacOS()) {
Expand Down