Skip to content

Divide board menu into submenus #9238

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 6 commits into from
Mar 25, 2020
Merged

Divide board menu into submenus #9238

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e97727
Handle nested submenus of the Tools menu
matthijskooijman Sep 19, 2019
89cf600
Separate the boards menu per platform
matthijskooijman Jan 26, 2020
1964b81
Do not use a boards submenu with just one platform
matthijskooijman Sep 19, 2019
55fa3f5
Sort board submenus alphabetically
matthijskooijman Feb 3, 2020
e003049
Do not translate labels of boards submenus
cmaglie Mar 25, 2020
b821f75
Removed some trivial warnings
cmaglie Mar 25, 2020
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
Prev Previous commit
Next Next commit
Do not use a boards submenu with just one platform 
When just one platform is installed, it does not make much sense to use
a submenu, so just add the boards directly under the boards menu as
before.
  • Loading branch information
@matthijskooijman @cmaglie
matthijskooijman authored and cmaglie committed Mar 25, 2020
commit 1964b81c3290d80de11736e19640ca52e6cb6345
19 changes: 15 additions & 4 deletions app/src/processing/app/Base.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1511,10 +1511,21 @@ public void actionPerformed(ActionEvent actionevent) {
}

JMenuItem firstBoardItem = null;
for (JMenu platformMenu : platformMenus) {
if (firstBoardItem == null && platformMenu.getItemCount() > 0)
firstBoardItem = platformMenu.getItem(0);
boardMenu.add(platformMenu);
if (platformMenus.size() == 1) {
// When just one platform exists, add the board items directly,
// rather than using a submenu
for (Component boardItem : platformMenus.get(0).getMenuComponents()) {
boardMenu.add(boardItem);
if (firstBoardItem == null)
firstBoardItem = (JMenuItem)boardItem;
}
} else {
// For multiple platforms, use submenus
for (JMenu platformMenu : platformMenus) {
if (firstBoardItem == null && platformMenu.getItemCount() > 0)
firstBoardItem = platformMenu.getItem(0);
boardMenu.add(platformMenu);
}
}

if (firstBoardItem == null) {
Expand Down