From b4ac525392d69da3e1beac7fc8e828eb3c9edf1d Mon Sep 17 00:00:00 2001
From: Ben Fry <ben@fathom.info>
Date: Fri, 5 Jun 2015 22:20:58 -0400
Subject: [PATCH] untangling present vs full screen

---
 build/shared/lib/languages/PDE.properties       |  2 +-
 java/src/processing/mode/java/JavaBuild.java    |  2 +-
 java/src/processing/mode/java/JavaEditor.java   | 17 ++++++++---------
 .../mode/java/preproc/PdePreprocessor.java      |  4 ++--
 .../src/processing/mode/java/runner/Runner.java |  2 +-
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties
index 86dc73744..533fa0b13 100644
--- a/build/shared/lib/languages/PDE.properties
+++ b/build/shared/lib/languages/PDE.properties
@@ -201,7 +201,7 @@ examples.core_libraries = Core Libraries
 export = Export Options
 export.platforms = Platforms
 export.options = Options
-export.options.fullscreen = Full Screen (Present mode)
+export.options.present = Presentation Mode
 export.options.show_stop_button = Show a Stop button
 export.description.line1 = Export to Application creates double-clickable,
 export.description.line2 = standalone applications for the selected platforms.
diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java
index cda74323e..c2706601f 100644
--- a/java/src/processing/mode/java/JavaBuild.java
+++ b/java/src/processing/mode/java/JavaBuild.java
@@ -1155,7 +1155,7 @@ public class JavaBuild {
           }
           while ((index = sb.indexOf("@@lsuipresentationmode@@")) != -1) {
             sb.replace(index, index + "@@lsuipresentationmode@@".length(),
-                       Preferences.getBoolean("export.application.fullscreen") ? "4" : "0");
+                       Preferences.getBoolean("export.application.present") ? "4" : "0");
           }
 
           lines[i] = sb.toString();
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index b5eda3f4d..f13e928d4 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -740,25 +740,24 @@ public class JavaEditor extends Editor {
         Preferences.setBoolean("export.application.stop", showStopButton.isSelected());
       }
     });
-    showStopButton.setEnabled(Preferences.getBoolean("export.application.fullscreen"));
+    showStopButton.setEnabled(Preferences.getBoolean("export.application.present"));
     showStopButton.setBorder(new EmptyBorder(3, 13 + indent, 6, 13));
 
-    final JCheckBox fullScreenButton = new JCheckBox(Language.text("export.options.fullscreen"));
-    //fullscreenButton.setMnemonic(KeyEvent.VK_F);
-    fullScreenButton.setSelected(Preferences.getBoolean("export.application.fullscreen"));
-    fullScreenButton.addItemListener(new ItemListener() {
+    final JCheckBox presentButton = new JCheckBox(Language.text("export.options.fullscreen"));
+    presentButton.setSelected(Preferences.getBoolean("export.application.present"));
+    presentButton.addItemListener(new ItemListener() {
       public void itemStateChanged(ItemEvent e) {
-        boolean sal = fullScreenButton.isSelected();
-        Preferences.setBoolean("export.application.fullscreen", sal);
+        boolean sal = presentButton.isSelected();
+        Preferences.setBoolean("export.application.present", sal);
         showStopButton.setEnabled(sal);
       }
     });
-    fullScreenButton.setBorder(new EmptyBorder(3, 13, 3, 13));
+    presentButton.setBorder(new EmptyBorder(3, 13, 3, 13));
 
     JPanel presentPanel = new JPanel();
     presentPanel.setLayout(new BoxLayout(presentPanel, BoxLayout.Y_AXIS));
     Box fullScreenBox = Box.createHorizontalBox();
-    fullScreenBox.add(fullScreenButton);
+    fullScreenBox.add(presentButton);
 
     /*
     //run.present.stop.color
diff --git a/java/src/processing/mode/java/preproc/PdePreprocessor.java b/java/src/processing/mode/java/preproc/PdePreprocessor.java
index a41594824..efaad15a7 100644
--- a/java/src/processing/mode/java/preproc/PdePreprocessor.java
+++ b/java/src/processing/mode/java/preproc/PdePreprocessor.java
@@ -997,8 +997,8 @@ public class PdePreprocessor {
         //out.print(indent + indent + "PApplet.main(new String[] { ");
         out.print(indent + indent + "String[] appletArgs = new String[] { ");
 
-        if (Preferences.getBoolean("export.application.fullscreen")) {
-          out.print("\"" + PApplet.ARGS_FULL_SCREEN + "\", ");
+        if (Preferences.getBoolean("export.application.present")) {
+          out.print("\"" + PApplet.ARGS_PRESENT + "\", ");
 
           String farbe = Preferences.get("run.present.bgcolor");
           out.print("\"" + PApplet.ARGS_WINDOW_COLOR + "=" + farbe + "\", ");
diff --git a/java/src/processing/mode/java/runner/Runner.java b/java/src/processing/mode/java/runner/Runner.java
index c157ebadf..862be3f69 100644
--- a/java/src/processing/mode/java/runner/Runner.java
+++ b/java/src/processing/mode/java/runner/Runner.java
@@ -379,7 +379,7 @@ public class Runner implements MessageConsumer {
 
 
       if (presenting) {
-        params.add(PApplet.ARGS_FULL_SCREEN);
+        params.add(PApplet.ARGS_PRESENT);
 //        if (Preferences.getBoolean("run.present.exclusive")) {
 //          params.add(PApplet.ARGS_EXCLUSIVE);
 //        }