rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-29 18:52:13 +01:00
Code Issues Releases Activity

Simplified Boards menu layout.

Browse Source 
Fixes #1307
This commit is contained in:
Cristian Maglie 2013-03-05 19:53:49 +01:00
parent 0947e3d55c
commit c1c87a1642
1 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/processing/app/Base.java
View File

@ -38,7 +38,8 @@ import processing.app.helpers.FileUtils;
import processing.app.helpers.PreferencesMap; import processing.app.helpers.PreferencesMap;
import processing.app.helpers.filefilters.OnlyDirs; import processing.app.helpers.filefilters.OnlyDirs;
import processing.app.helpers.filefilters.OnlyFilesWithExtension; import processing.app.helpers.filefilters.OnlyFilesWithExtension;
import processing.app.javax.swing.filechooser.FileNameExtensionFilter;import processing.app.packages.Library; import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
import processing.app.packages.Library;
import processing.app.packages.LibraryList; import processing.app.packages.LibraryList;
import processing.app.tools.ZipDeflater; import processing.app.tools.ZipDeflater;
import processing.core.*; import processing.core.*;
@ -1241,10 +1242,6 @@ public class Base {
for (TargetPackage targetPackage : packages.values()) { for (TargetPackage targetPackage : packages.values()) {
// For every package cycle through all platform // For every package cycle through all platform
for (TargetPlatform targetPlatform : targetPackage.platforms()) { for (TargetPlatform targetPlatform : targetPackage.platforms()) {
String platformLabel = targetPlatform.getPreferences().get("name");
if (platformLabel == null || targetPlatform.getBoards().isEmpty()) {
continue;
}
// Add a separator from the previous platform // Add a separator from the previous platform
if (!first) if (!first)
@ -1252,9 +1249,12 @@ public class Base {
first = false; first = false;
// Add a title for each platform // Add a title for each platform
JMenuItem separator = new JMenuItem(_(platformLabel)); String platformLabel = targetPlatform.getPreferences().get("name");
separator.setEnabled(false); if (platformLabel != null && !targetPlatform.getBoards().isEmpty()) {
boardsMenu.add(separator); JMenuItem menuLabel = new JMenuItem(_(platformLabel));
menuLabel.setEnabled(false);
boardsMenu.add(menuLabel);
}
// Cycle through all boards of this platform // Cycle through all boards of this platform
for (TargetBoard board : targetPlatform.getBoards().values()) { for (TargetBoard board : targetPlatform.getBoards().values()) {
@ -1266,36 +1266,6 @@ public class Base {
boardsMenu.add(item); boardsMenu.add(item);
boardsButtonGroup.add(item); boardsButtonGroup.add(item);
} }
// Cycle through all boards of referenced platforms
for (TargetPackage pack : packages.values()) {
if (pack == targetPackage)
continue;
for (TargetPlatform platf : pack.getPlatforms().values()) {
if (!platf.getId().equals(targetPlatform.getId()))
continue;
boolean firstRefBoardBlock = true;
for (TargetBoard board : platf.getBoards().values()) {
String ref = board.getReferencedPackageId();
if (ref == null || !ref.equals(targetPackage.getId()))
continue;
// Add a separator from the previous platform
if (firstRefBoardBlock)
boardsMenu.add(new JSeparator());
firstRefBoardBlock = false;
JMenuItem item = createBoardMenusAndCustomMenus(
editor,
menuItemsToClickAfterStartup,
buttonGroupsMap,
board, platf,
pack);
boardsMenu.add(item);
boardsButtonGroup.add(item);
}
}
}
} }
} }