rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-15 12:29:26 +01:00
Code Issues Releases Activity

Unused custom menus are not showed

Browse Source
This commit is contained in:
Cristian Maglie 2013-03-04 17:56:51 +01:00
parent 6bfe877c45
commit 0947e3d55c
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1229,15 +1229,13 @@ public class Base {
Map<String, ButtonGroup> buttonGroupsMap = new HashMap<String, ButtonGroup>(); Map<String, ButtonGroup> buttonGroupsMap = new HashMap<String, ButtonGroup>();
// Generate custom menus for all platforms // Generate custom menus for all platforms
Set<String> titles = new HashSet<String>();
for (TargetPackage targetPackage : packages.values()) { for (TargetPackage targetPackage : packages.values()) {
for (TargetPlatform targetPlatform : targetPackage.platforms()) { for (TargetPlatform targetPlatform : targetPackage.platforms())
PreferencesMap customMenus = targetPlatform.getCustomMenus(); titles.addAll(targetPlatform.getCustomMenus().values());
for (String menuId : customMenus.keySet()) {
String title = customMenus.get(menuId);
makeBoardCustomMenu(toolsMenu, _(title));
}
}
} }
for (String title : titles)
makeBoardCustomMenu(toolsMenu, _(title));
// Cycle through all packages // Cycle through all packages
for (TargetPackage targetPackage : packages.values()) { for (TargetPackage targetPackage : packages.values()) {
@ -1399,9 +1397,9 @@ public class Base {
JMenuItem menuItem = menu.getItem(m); JMenuItem menuItem = menu.getItem(m);
menuItem.setVisible(menuItem.getAction().getValue("board").equals(boardID)); menuItem.setVisible(menuItem.getAction().getValue("board").equals(boardID));
} }
menu.setEnabled(ifThereAreVisibleItemsOn(menu)); menu.setVisible(ifThereAreVisibleItemsOn(menu));
if (menu.isEnabled()) { if (menu.isVisible()) {
JMenuItem visibleSelectedOrFirstMenuItem = selectVisibleSelectedOrFirstMenuItem(menu); JMenuItem visibleSelectedOrFirstMenuItem = selectVisibleSelectedOrFirstMenuItem(menu);
if (!visibleSelectedOrFirstMenuItem.isSelected()) { if (!visibleSelectedOrFirstMenuItem.isSelected()) {
visibleSelectedOrFirstMenuItem.setSelected(true); visibleSelectedOrFirstMenuItem.setSelected(true);