remove unused class, put the useful bits into prefs

benfry · benfry · commit 80e5b0b4b236 · 2015-05-18T15:09:17.000-04:00
diff --git a/app/src/processing/app/PreferencesFrame.java b/app/src/processing/app/PreferencesFrame.java
@@ -38,10 +38,10 @@
 
 
 /**
- * Window for modifying preferences.
+ * Creates the window for modifying preferences.
  */
 public class PreferencesFrame {
-  JFrame dialog;
+  JFrame frame;
   GroupLayout layout;
 
   static final Integer[] FONT_SIZES = { 10, 12, 14, 18, 24, 36, 48 };
@@ -83,18 +83,15 @@ public class PreferencesFrame {
 
   public PreferencesFrame(Base base) {
     this.base = base;
-    //dialog = new JDialog(editor, "Preferences", true);
-    dialog = new JFrame(Language.text("preferences"));
-    Container pain = dialog.getContentPane();
+
+    frame = new JFrame(Language.text("preferences"));
+    Container pain = frame.getContentPane();
     layout = new GroupLayout(pain);
     layout.setAutoCreateGaps(true);
     layout.setAutoCreateContainerGaps(true);
 
     pain.setLayout(layout);
 
-//    final int GUI_BETWEEN = Preferences.GUI_BETWEEN;
-//    final int GUI_BIG = Preferences.GUI_BIG;
-//    final int GUI_SMALL = Preferences.GUI_SMALL;
     final int BUTTON_WIDTH = Preferences.BUTTON_WIDTH;
     final int BORDER = Base.isMacOS() ? 20 : 13;
 
@@ -115,13 +112,12 @@ public void actionPerformed(ActionEvent e) {
           File dflt = new File(sketchbookLocationField.getText());
           PApplet.selectFolder(Language.text("preferences.sketchbook_location.popup"),
                                "sketchbookCallback", dflt,
-                               PreferencesFrame.this, dialog);
+                               PreferencesFrame.this, frame);
         }
       });
 
-    // Language: [ English ] (requires restart of Processing)
-
 
+    // Language: [ English ] (requires restart of Processing)
 
     JLabel languageLabel = new JLabel(Language.text("preferences.language")+": ");
     languageSelectionBox = new JComboBox<String>();
@@ -136,17 +132,10 @@ public void actionPerformed(ActionEvent e) {
       }
     }
     languageSelectionBox.setModel(new DefaultComboBoxModel<String>(languageSelection));
-    restartProcessingLabel = new JLabel(" ("+Language.text("preferences.requires_restart")+")");
+    restartProcessingLabel = new JLabel(" (" + Language.text("preferences.requires_restart") + ")");
 
-    // Editor and console font [ Source Code Pro ]
 
-    // Nevermind on this for now.. Java doesn't seem to have a method for
-    // enumerating only the fixed-width (monospaced) fonts. To do this
-    // properly, we'd need to list the fonts, and compare the metrics of
-    // i and M for each. When they're identical (and not degenerate),
-    // we'd call that font fixed width. That's all a very expensive set of
-    // operations, so it should also probably be cached between runs and
-    // updated in the background.
+    // Editor and console font [ Source Code Pro ]
 
     JLabel fontLabel = new JLabel(Language.text("preferences.editor_and_console_font")+": ");
     final String fontTip = "<html>" + Language.text("preferences.editor_and_console_font.tip");
@@ -157,6 +146,7 @@ public void actionPerformed(ActionEvent e) {
     //updateDisplayList();
     fontSelectionBox.setEnabled(false);  // don't enable until fonts are loaded
 
+
     // Editor font size [ 12 ]  Console font size [ 10 ]
 
     JLabel fontSizelabel = new JLabel(Language.text("preferences.editor_font_size")+": ");
@@ -228,7 +218,7 @@ public void run() {
       @Override public void changedUpdate(DocumentEvent e) {}
     });
 
-    selector = new ColorChooser(dialog, false,
+    selector = new ColorChooser(frame, false,
         Preferences.getColor("run.present.bgcolor"), Language.text("prompt.ok"),
         new ActionListener() {
           @Override
@@ -244,12 +234,12 @@ public void actionPerformed(ActionEvent e) {
 
       @Override
       public void mouseExited(MouseEvent e) {
-        dialog.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+        frame.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
       }
 
       @Override
       public void mouseEntered(MouseEvent e) {
-        dialog.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+        frame.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
       }
 
       @Override
@@ -260,57 +250,45 @@ public void mouseClicked(MouseEvent e) {
 
     JLabel hashLabel = new JLabel("#");
 
+
     // [ ] Use smooth text in editor window
 
     editorAntialiasBox = new JCheckBox(Language.text("preferences.use_smooth_text"));
 
+
     // [ ] Enable complex text input (for Japanese et al, requires restart)
 
     inputMethodBox =
       new JCheckBox(Language.text("preferences.enable_complex_text_input")+
                     " ("+Language.text("preferences.enable_complex_text_input_example")+
                     ", "+Language.text("preferences.requires_restart")+")");
 
+
     // [ ] Continuously check for errors - PDE X
 
     errorCheckerBox =
       new JCheckBox(Language.text("preferences.continuously_check"));
 
+
     // [ ] Show Warnings - PDE X
 
     warningsCheckerBox =
       new JCheckBox(Language.text("preferences.show_warnings"));
 
+
     // [ ] Enable Code Completion - PDE X
 
     codeCompletionBox =
       new JCheckBox(Language.text("preferences.code_completion") +
                     " Ctrl-" + Language.text("preferences.cmd_space"));
-////    codeCompletionBox.addActionListener(new ActionListener() {
-////
-////      @Override
-////      public void actionPerformed(ActionEvent e) {
-////        // Disble code completion trigger option if completion is disabled
-////        codeCompletionTriggerBox.setEnabled(codeCompletionBox.isSelected());
-////      }
-////    });
-
-////    int toggleLeft = left + d.width;
-
-    //// [ ] Toggle Code Completion Trigger - PDE X. No longer needed (Manindra)
-
-////    codeCompletionTriggerBox =
-////      new JCheckBox(Language.text("preferences.trigger_with")+" Ctrl-"+Language.text("preferences.cmd_space"));
-////    pain.add(codeCompletionTriggerBox);
-////    d = codeCompletionTriggerBox.getPreferredSize();
-////    codeCompletionTriggerBox.setBounds(toggleLeft, top, d.width + 10, d.height);
-////    right = Math.max(right, toggleLeft + d.width);
+
 
     // [ ] Show import suggestions - PDE X
 
     importSuggestionsBox =
       new JCheckBox(Language.text("preferences.suggest_imports"));
 
+
     // [ ] Increase maximum available memory to [______] MB
 
     memoryOverrideBox = new JCheckBox(Language.text("preferences.increase_max_memory")+": ");
@@ -323,16 +301,19 @@ public void stateChanged(ChangeEvent e) {
     });
     JLabel mbLabel = new JLabel("MB");
 
+
     // [ ] Delete previous application folder on export
 
     deletePreviousBox =
       new JCheckBox(Language.text("preferences.delete_previous_folder_on_export"));
 
+
     // [ ] Check for updates on startup
 
     checkUpdatesBox =
       new JCheckBox(Language.text("preferences.check_for_updates_on_startup"));
 
+
     // Run sketches on display [  1 ]
 
     JLabel displayLabel = new JLabel(Language.text("preferences.run_sketches_on_display")+": ");
@@ -347,6 +328,7 @@ public void stateChanged(ChangeEvent e) {
         new JCheckBox(Language.text("preferences.automatically_associate_pde_files"));
       autoAssociateBox.setVisible(false);
 
+
     // More preferences are in the ...
 
     JLabel morePreferenceLabel = new JLabel(Language.text("preferences.file") + ":");
@@ -373,6 +355,7 @@ public void mouseExited(MouseEvent e) {
     JLabel preferenceHintLabel = new JLabel("(" + Language.text("preferences.file.hint") + ")");
     preferenceHintLabel.setForeground(Color.gray);
 
+
     // [  OK  ] [ Cancel ]
 
     okButton = new JButton(Preferences.PROMPT_OK);
@@ -506,7 +489,7 @@ public void actionPerformed(ActionEvent e) {
     }
     // closing the window is same as hitting cancel button
 
-    dialog.addWindowListener(new WindowAdapter() {
+    frame.addWindowListener(new WindowAdapter() {
       public void windowClosing(WindowEvent e) {
         disposeFrame();
       }
@@ -519,11 +502,11 @@ public void actionPerformed(ActionEvent actionEvent) {
     };
     // finish up
 
-    Toolkit.registerWindowCloseKeys(dialog.getRootPane(), disposer);
-    Toolkit.setIcon(dialog);
-    dialog.setResizable(false);
-    dialog.pack();
-    dialog.setLocationRelativeTo(null);
+    Toolkit.registerWindowCloseKeys(frame.getRootPane(), disposer);
+    Toolkit.setIcon(frame);
+    frame.setResizable(false);
+    frame.pack();
+    frame.setLocationRelativeTo(null);
 
     // Workaround for OS X, which breaks the layout when these are set earlier
     // https://github.com/processing/processing/issues/3212
@@ -545,26 +528,17 @@ public void keyPressed(KeyEvent e) {
   }
 
 
+  /** Callback for the folder selector. */
   public void sketchbookCallback(File file) {
-    if (file != null) {
+    if (file != null) {  // null if cancel or closed
       sketchbookLocationField.setText(file.getAbsolutePath());
     }
   }
 
 
-//  public Dimension getPreferredSize() {
-//    return new Dimension(wide, high);
-//  }
-
-
-  // .................................................................
-
-
-  /**
-   * Close the window after an OK or Cancel.
-   */
+  /** Close the window after an OK or Cancel. */
   protected void disposeFrame() {
-    dialog.dispose();
+    frame.dispose();
   }
 
 
@@ -726,21 +700,21 @@ public void run() {
     }
     // The OK Button has to be set as the default button every time the
     // PrefWindow is to be displayed
-    dialog.getRootPane().setDefaultButton(okButton);
+    frame.getRootPane().setDefaultButton(okButton);
 
     // The pack is called again here second time to fix layout bugs
     // the bugs are not due to groupLayout but due to HTML rendering of components
     // more info can be found here -> https://netbeans.org/bugzilla/show_bug.cgi?id=79967
-    dialog.pack();
+    frame.pack();
 
-    dialog.setVisible(true);
+    frame.setVisible(true);
   }
 
 
   /**
    * I have some ideas on how we could make Swing even more obtuse for the
    * most basic usage scenarios. Is there someone on the team I can contact?
-   * Oracle staffer, are you reading this? This could be your meal ticket.
+   * Are you an Oracle staffer reading this? This could be your meal ticket.
    */
   static class FontNamer extends JLabel implements ListCellRenderer<Font> {
     public Component getListCellRendererComponent(JList<? extends Font> list,
@@ -776,15 +750,25 @@ public void run() {
 
   void updateDisplayList() {
     GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
-    displayCount = ge.getScreenDevices().length;
-//    displaySelectionBox.removeAll();
+    GraphicsDevice defaultDevice = ge.getDefaultScreenDevice();
+    GraphicsDevice[] devices = ge.getScreenDevices();
+
+    displayCount = devices.length;
     String[] items = new String[displayCount];
     for (int i = 0; i < displayCount; i++) {
-      items[i] = String.valueOf(i + 1);
-//      displaySelectionBox.add(String.valueOf(i + 1));
+      DisplayMode mode = devices[i].getDisplayMode();
+      String title = String.format("%d (%d \u2715 %d)",  // or \u00d7?
+                                   i + 1, mode.getWidth(), mode.getHeight());
+      if (devices[i] == defaultDevice) {
+        title += " default";
+      }
+      items[i] = title;
     }
-//    PApplet.println(items);
     displaySelectionBox.setModel(new DefaultComboBoxModel<String>(items));
-//    displaySelectionBox = new JComboBox(items);
+
+    // Disable it if you can't actually change the default display
+    if (displayCount == 1) {
+      displaySelectionBox.setEnabled(false);
+    }
   }
 }
diff --git a/java/.classpath b/java/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="generated"/>
-	<classpathentry excluding="processing/mode/java/PresentMode.java" kind="src" path="src"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="lib" path="mode/antlr.jar"/>
 	<classpathentry kind="lib" path="mode/classpath-explorer-1.0.jar"/>
 	<classpathentry kind="lib" path="mode/com.ibm.icu.jar"/>
diff --git a/java/src/processing/mode/java/PresentMode.java b/java/src/processing/mode/java/PresentMode.java
