MacOSX: when closing, no confirmation is displayed any more, unless at least one sketch is modified. In essence: now mac behaves just like the other OSs. Fixes #3093

Federico Fissore · Federico Fissore · commit 2afdb8a6c326 · 2015-05-26T12:02:20.000+02:00
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -910,35 +910,6 @@ public boolean handleClose(Editor editor) {
     editor.internalCloseRunner();
 
     if (editors.size() == 1) {
-      // For 0158, when closing the last window /and/ it was already an
-      // untitled sketch, just give up and let the user quit.
-//      if (Preferences.getBoolean("sketchbook.closing_last_window_quits") ||
-//          (editor.untitled && !editor.getSketch().isModified())) {
-      if (OSUtils.isMacOS()) {
-        Object[] options = {"OK", "Cancel"};
-        String prompt =
-                _("<html> " +
-                        "<head> <style type=\"text/css\">" +
-                        "b { font: 13pt \"Lucida Grande\" }" +
-                        "p { font: 11pt \"Lucida Grande\"; margin-top: 8px }" +
-                        "</style> </head>" +
-                        "<b>Are you sure you want to Quit?</b>" +
-                        "<p>Closing the last open sketch will quit Arduino.");
-
-        int result = JOptionPane.showOptionDialog(editor,
-                prompt,
-                _("Quit"),
-                JOptionPane.YES_NO_OPTION,
-                JOptionPane.QUESTION_MESSAGE,
-                null,
-                options,
-                options[0]);
-        if (result == JOptionPane.NO_OPTION ||
-                result == JOptionPane.CLOSED_OPTION) {
-          return false;
-        }
-      }
-
       // This will store the sketch count as zero
       editors.remove(editor);
       try {
diff --git a/app/src/processing/app/macosx/ThinkDifferent.java b/app/src/processing/app/macosx/ThinkDifferent.java
@@ -83,7 +83,7 @@ public void openFiles(final AppEvent.OpenFilesEvent openFilesEvent) {
       @Override
       public void handleQuitRequestWith(AppEvent.QuitEvent quitEvent, QuitResponse quitResponse) {
         if (waitForBase()) {
-          if (Base.INSTANCE.handleClose(Base.INSTANCE.getActiveEditor())) {
+          if (Base.INSTANCE.handleQuit()) {
             quitResponse.performQuit();
           } else {
             quitResponse.cancelQuit();
@@ -113,4 +113,4 @@ private static void sleep(int millis) {
     }
   }
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public void openFiles(final AppEvent.OpenFilesEvent openFilesEvent) {`
`83`	`83`	`@Override`
`84`	`84`	`public void handleQuitRequestWith(AppEvent.QuitEvent quitEvent, QuitResponse quitResponse) {`
`85`	`85`	`if (waitForBase()) {`
`86`		`- if (Base.INSTANCE.handleClose(Base.INSTANCE.getActiveEditor())) {`
	`86`	`+ if (Base.INSTANCE.handleQuit()) {`
`87`	`87`	`quitResponse.performQuit();`
`88`	`88`	`} else {`
`89`	`89`	`quitResponse.cancelQuit();`
`@@ -113,4 +113,4 @@ private static void sleep(int millis) {`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`		`-}`
	`116`	`+}`