Skip to content

Split ports in menu, grouping boards by their protocol #2628

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 1 commit into from
Feb 13, 2015
Merged

Split ports in menu, grouping boards by their protocol #2628

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 29 additions & 3 deletions app/src/processing/app/Editor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
@SuppressWarnings("serial")
public class Editor extends JFrame implements RunnerListener {

private final static List<String> BOARD_PROTOCOLS_ORDER = Arrays.asList(new String[]{"serial", "network"});
private final static List<String> BOARD_PROTOCOLS_ORDER_TRANSLATIONS = Arrays.asList(new String[]{_("Serial ports"), _("Network ports")});

Base base;

// otherwise, if the window is resized with the message label
Expand Down Expand Up @@ -441,7 +444,7 @@ protected void applyPreferences() {
textarea.setEditable(!external);
saveMenuItem.setEnabled(!external);
saveAsMenuItem.setEnabled(!external);

textarea.setDisplayLineNumbers(Preferences.getBoolean("editor.linenumbers"));

TextAreaPainter painter = textarea.getPainter();
Expand Down Expand Up @@ -996,7 +999,30 @@ protected void populatePortMenu() {
String selectedPort = Preferences.get("serial.port");

List<BoardPort> ports = Base.getDiscoveryManager().discovery();

Collections.sort(ports, new Comparator<BoardPort>() {
@Override
public int compare(BoardPort o1, BoardPort o2) {
return BOARD_PROTOCOLS_ORDER.indexOf(o1.getProtocol()) - BOARD_PROTOCOLS_ORDER.indexOf(o2.getProtocol());
}
});

String lastProtocol = null;
String lastProtocolTranslated;
for (BoardPort port : ports) {
if (lastProtocol == null || !port.getProtocol().equals(lastProtocol)) {
if (lastProtocol != null) {
serialMenu.addSeparator();
}
lastProtocol = port.getProtocol();

if (BOARD_PROTOCOLS_ORDER.indexOf(port.getProtocol()) != -1) {
lastProtocolTranslated = BOARD_PROTOCOLS_ORDER_TRANSLATIONS.get(BOARD_PROTOCOLS_ORDER.indexOf(port.getProtocol()));
} else {
lastProtocolTranslated = port.getProtocol();
}
serialMenu.add(new JMenuItem(_(lastProtocolTranslated)));
}
String address = port.getAddress();
String label = port.getLabel();

Expand Down Expand Up @@ -1646,7 +1672,7 @@ protected void setCode(SketchCodeDocument codeDoc) {
if (document == null) { // this document not yet inited
document = new SyntaxDocument();
codeDoc.setDocument(document);

// turn on syntax highlighting
document.setTokenMarker(new PdeKeywords());

Expand Down Expand Up @@ -1870,7 +1896,7 @@ protected String getCurrentKeyword() {

} catch (BadLocationException bl) {
bl.printStackTrace();
}
}
return text;
}

Expand Down