rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-21 15:54:39 +01:00
Code Issues Releases Activity

Refactored function to get status of menus in MacOSX

Browse Source
This commit is contained in:
Cristian Maglie 2017-09-28 12:57:56 +02:00
parent 59a57a9312
commit 369b23a7d2
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -971,7 +971,7 @@ public class Base {
// Save out the current prefs state
PreferencesData.save();
if (!OSUtils.isMacOS() || System.getProperty("apple.laf.useScreenMenuBar") == "false") {
if (!OSUtils.hasMacOSStyleMenus()) {
// If this was fired from the menu or an AppleEvent (the Finder),
// then Mac OS X will send the terminate signal itself.
System.exit(0);

6
app/src/processing/app/Editor.java
View File

@ -619,7 +619,7 @@ public class Editor extends JFrame implements RunnerListener {
fileMenu.add(item);
// macosx already has its own preferences and quit menu
if (!OSUtils.isMacOS() || System.getProperty("apple.laf.useScreenMenuBar") == "false") {
if (!OSUtils.hasMacOSStyleMenus()) {
fileMenu.addSeparator();
item = newJMenuItem(tr("Preferences"), ',');
@ -1252,7 +1252,7 @@ public class Editor extends JFrame implements RunnerListener {
menu.add(item);
// macosx already has its own about menu
if (!OSUtils.isMacOS() || System.getProperty("apple.laf.useScreenMenuBar") == "false") {
if (!OSUtils.hasMacOSStyleMenus()) {
menu.addSeparator();
item = new JMenuItem(tr("About Arduino"));
item.addActionListener(new ActionListener() {
@ -1812,7 +1812,7 @@ public class Editor extends JFrame implements RunnerListener {
String prompt = I18n.format(tr("Save changes to \"{0}\"? "),
sketch.getName());
if (!OSUtils.isMacOS() || System.getProperty("apple.laf.useScreenMenuBar") == "false") {
if (!OSUtils.hasMacOSStyleMenus()) {
int result =
JOptionPane.showConfirmDialog(this, prompt, tr("Close"),
JOptionPane.YES_NO_CANCEL_OPTION,

3
arduino-core/src/processing/app/helpers/OSUtils.java
View File

@ -26,4 +26,7 @@ public class OSUtils {
return System.getProperty("os.name").contains("Mac");
}
static public boolean hasMacOSStyleMenus() {
return OSUtils.isMacOS() && System.getProperty("apple.laf.useScreenMenuBar").equals("true");
}
}