Skip to content

Commit 43325ca

Browse files
benfrybenfry
committed
untangling present vs full screen
1 parent cd758e0 commit 43325ca

5 files changed

Lines changed: 13 additions & 14 deletions

File tree

‎build/shared/lib/languages/PDE.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ examples.core_libraries = Core Libraries
201201
export = Export Options
202202
export.platforms = Platforms
203203
export.options = Options
204-
export.options.fullscreen = Full Screen (Present mode)
204+
export.options.present = Presentation Mode
205205
export.options.show_stop_button = Show a Stop button
206206
export.description.line1 = Export to Application creates double-clickable,
207207
export.description.line2 = standalone applications for the selected platforms.

‎java/src/processing/mode/java/JavaBuild.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1155,7 +1155,7 @@ protected boolean exportApplication(File destFolder,
11551155
}
11561156
while ((index = sb.indexOf("@@lsuipresentationmode@@")) != -1) {
11571157
sb.replace(index, index + "@@lsuipresentationmode@@".length(),
1158-
Preferences.getBoolean("export.application.fullscreen") ? "4" : "0");
1158+
Preferences.getBoolean("export.application.present") ? "4" : "0");
11591159
}
11601160

11611161
lines[i] = sb.toString();

‎java/src/processing/mode/java/JavaEditor.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -740,25 +740,24 @@ public void itemStateChanged(ItemEvent e) {
740740
Preferences.setBoolean("export.application.stop", showStopButton.isSelected());
741741
}
742742
});
743-
showStopButton.setEnabled(Preferences.getBoolean("export.application.fullscreen"));
743+
showStopButton.setEnabled(Preferences.getBoolean("export.application.present"));
744744
showStopButton.setBorder(new EmptyBorder(3, 13 + indent, 6, 13));
745745

746-
final JCheckBox fullScreenButton = new JCheckBox(Language.text("export.options.fullscreen"));
747-
//fullscreenButton.setMnemonic(KeyEvent.VK_F);
748-
fullScreenButton.setSelected(Preferences.getBoolean("export.application.fullscreen"));
749-
fullScreenButton.addItemListener(new ItemListener() {
746+
final JCheckBox presentButton = new JCheckBox(Language.text("export.options.fullscreen"));
747+
presentButton.setSelected(Preferences.getBoolean("export.application.present"));
748+
presentButton.addItemListener(new ItemListener() {
750749
public void itemStateChanged(ItemEvent e) {
751-
boolean sal = fullScreenButton.isSelected();
752-
Preferences.setBoolean("export.application.fullscreen", sal);
750+
boolean sal = presentButton.isSelected();
751+
Preferences.setBoolean("export.application.present", sal);
753752
showStopButton.setEnabled(sal);
754753
}
755754
});
756-
fullScreenButton.setBorder(new EmptyBorder(3, 13, 3, 13));
755+
presentButton.setBorder(new EmptyBorder(3, 13, 3, 13));
757756

758757
JPanel presentPanel = new JPanel();
759758
presentPanel.setLayout(new BoxLayout(presentPanel, BoxLayout.Y_AXIS));
760759
Box fullScreenBox = Box.createHorizontalBox();
761-
fullScreenBox.add(fullScreenButton);
760+
fullScreenBox.add(presentButton);
762761

763762
/*
764763
//run.present.stop.color

‎java/src/processing/mode/java/preproc/PdePreprocessor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -997,8 +997,8 @@ protected void writeFooter(PrintWriter out, String className) {
997997
//out.print(indent + indent + "PApplet.main(new String[] { ");
998998
out.print(indent + indent + "String[] appletArgs = new String[] { ");
999999

1000-
if (Preferences.getBoolean("export.application.fullscreen")) {
1001-
out.print("\"" + PApplet.ARGS_FULL_SCREEN + "\", ");
1000+
if (Preferences.getBoolean("export.application.present")) {
1001+
out.print("\"" + PApplet.ARGS_PRESENT + "\", ");
10021002

10031003
String farbe = Preferences.get("run.present.bgcolor");
10041004
out.print("\"" + PApplet.ARGS_WINDOW_COLOR + "=" + farbe + "\", ");

‎java/src/processing/mode/java/runner/Runner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ protected String[] getSketchParams(boolean presenting) {
379379

380380

381381
if (presenting) {
382-
params.add(PApplet.ARGS_FULL_SCREEN);
382+
params.add(PApplet.ARGS_PRESENT);
383383
// if (Preferences.getBoolean("run.present.exclusive")) {
384384
// params.add(PApplet.ARGS_EXCLUSIVE);
385385
// }

0 commit comments

Comments
 (0)