update the code completion pref here too

benfry · benfry · commit c548771c7c41 · 2014-09-12T17:47:22.000-04:00
diff --git a/app/src/processing/app/PreferencesFrame.java b/app/src/processing/app/PreferencesFrame.java
@@ -41,15 +41,15 @@
  * Window for modifying preferences.
  * <P>
  * This is ugly GUI code that uses exact layout. This was done in frustration
- * one evening (and pre-Swing), but that's long since past, and the code  
+ * one evening (and pre-Swing), but that's long since past, and the code
  * should instead be ported to a proper Swing layout like Group or BoxLayout.
  * <A HREF="https://github.com/processing/processing/issues/67">See here</A>.
  */
 public class PreferencesFrame {
   JFrame dialog;
   int wide, high;
 
-  static final Integer[] FONT_SIZES = { 10, 12, 14, 18, 24, 36, 48 }; 
+  static final Integer[] FONT_SIZES = { 10, 12, 14, 18, 24, 36, 48 };
 
   JTextField sketchbookLocationField;
   JTextField presentColor;
@@ -66,18 +66,18 @@ public class PreferencesFrame {
   JCheckBox autoAssociateBox;
 
   ColorChooser selector;
-  
+
   JCheckBox errorCheckerBox;
   JCheckBox warningsCheckerBox;
   JCheckBox codeCompletionBox;
   JCheckBox importSuggestionsBox;
   JCheckBox codeCompletionTriggerBox;
-  
+
   JComboBox displaySelectionBox;
   JComboBox languageSelectionBox;
 
   int displayCount;
-  
+
   String[] monoFontFamilies;
   JComboBox fontSelectionBox;
 
@@ -98,7 +98,7 @@ public PreferencesFrame(Base base) {
     final int GUI_BIG = Preferences.GUI_BIG;
     final int GUI_SMALL = Preferences.GUI_SMALL;
     final int BUTTON_WIDTH = Preferences.BUTTON_WIDTH;
-    
+
     int top = GUI_BIG;
     int left = GUI_BIG;
     int right = 0;
@@ -146,14 +146,14 @@ public void actionPerformed(ActionEvent e) {
     right = Math.max(right, h + d2.width + GUI_BIG);
     top += vmax + GUI_BETWEEN;
 
-    
+
     // Language: [ English ] (requires restart of Processing)
-    
+
     Container languageBox = Box.createHorizontalBox();
     JLabel languageLabel = new JLabel(Language.text("preferences.language")+": ");
     languageBox.add(languageLabel);
     languageSelectionBox = new JComboBox();
-    
+
     Map<String, String> languages = Language.getLanguages();
     String[] languageSelection = new String[languages.size()];
     languageSelection[0] = languages.get(Language.getLanguage());
@@ -171,16 +171,16 @@ public void actionPerformed(ActionEvent e) {
     d = languageBox.getPreferredSize();
     languageBox.setBounds(left, top, d.width, d.height);
     top += d.height + GUI_BETWEEN;
-    
+
 
     // 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 
+    // 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.
 
     Container fontBox = Box.createHorizontalBox();
@@ -192,7 +192,7 @@ public void actionPerformed(ActionEvent e) {
     fontSelectionBox = new JComboBox(new Object[] { Toolkit.getMonoFontName() });
     fontSelectionBox.setToolTipText(fontTip);
 //    fontSelectionBox.addItem(Toolkit.getMonoFont(size, style));
-    //updateDisplayList();  
+    //updateDisplayList();
     fontSelectionBox.setEnabled(false);  // don't enable until fonts are loaded
     fontBox.add(fontSelectionBox);
 //    fontBox.add(Box.createHorizontalGlue());
@@ -201,8 +201,8 @@ public void actionPerformed(ActionEvent e) {
     fontBox.setBounds(left, top, d.width + 150, d.height);
 //    fontBox.setBounds(left, top, dialog.getWidth() - left*2, d.height);
     top += d.height + GUI_BETWEEN;
-    
-    
+
+
     // Editor font size [ 12 ]  Console font size [ 10 ]
 
     Container box = Box.createHorizontalBox();
@@ -215,20 +215,20 @@ public void actionPerformed(ActionEvent e) {
     box.add(Box.createHorizontalStrut(GUI_BETWEEN));
 
     label = new JLabel(Language.text("preferences.console_font_size")+": ");
-    
+
     box.add(label);
 //    consoleSizeField = new JComboBox<Integer>(FONT_SIZES);
     consoleSizeField = new JComboBox<Integer>(FONT_SIZES);
     consoleSizeField.setEditable(true);
     box.add(consoleSizeField);
-    
+
     pain.add(box);
     d = box.getPreferredSize();
     box.setBounds(left, top, d.width, d.height);
     fontSizeField.setSelectedItem(Preferences.getFont("editor.font.size"));
     top += d.height + GUI_BETWEEN;
-    
-    
+
+
     Container colorBox = Box.createHorizontalBox();
 
     label = new JLabel(Language.text("preferences.background_color")+": ");
@@ -319,8 +319,8 @@ public void actionPerformed(ActionEvent e) {
     presentColor.addMouseListener(new MouseListener() {
       @Override public void mouseReleased(MouseEvent e) {}
       @Override public void mousePressed(MouseEvent e) {}
-      
-      @Override 
+
+      @Override
       public void mouseExited(MouseEvent e) {
         dialog.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
       }
@@ -341,16 +341,16 @@ public void mouseClicked(MouseEvent e) {
     colorBox.add(presentColorHex);
     colorBox.add(Box.createHorizontalStrut(GUI_SMALL + 2 / 3 * GUI_SMALL));
     colorBox.add(presentColor);
-    
+
     pain.add(colorBox);
     d = colorBox.getPreferredSize();
     colorBox.setBounds(left, top, d.width, d.height);
 
     top += d.height + GUI_BETWEEN;
 
-    
+
     // [ ] Use smooth text in editor window
-    
+
     editorAntialiasBox = new JCheckBox(Language.text("preferences.use_smooth_text"));
     pain.add(editorAntialiasBox);
     d = editorAntialiasBox.getPreferredSize();
@@ -359,7 +359,7 @@ public void mouseClicked(MouseEvent e) {
     right = Math.max(right, left + d.width);
     top += d.height + GUI_BETWEEN;
 
-    
+
     // [ ] Enable complex text input (for Japanese et al, requires restart)
 
     inputMethodBox =
@@ -371,21 +371,21 @@ public void mouseClicked(MouseEvent e) {
     inputMethodBox.setBounds(left, top, d.width + 10, d.height);
     right = Math.max(right, left + d.width);
     top += d.height + GUI_BETWEEN;
-    
-    
+
+
     // [ ] Continuously check for errors - PDE X
 
     errorCheckerBox =
       new JCheckBox(Language.text("preferences.continuously_check"));
-    
+
     pain.add(errorCheckerBox);
     d = errorCheckerBox.getPreferredSize();
     errorCheckerBox.setBounds(left, top, d.width + 10, d.height);
     //right = Math.max(right, left + d.width);
     //top += d.height + GUI_BETWEEN;
-    int warningLeft = left + d.width; 
+    int warningLeft = left + d.width;
+
 
-    
     // [ ] Show Warnings - PDE X
 
     warningsCheckerBox =
@@ -396,7 +396,7 @@ public void mouseClicked(MouseEvent e) {
     right = Math.max(right, warningLeft + d.width);
     top += d.height + GUI_BETWEEN;
 
-    
+
     // [ ] Enable Code Completion - PDE X
 
     codeCompletionBox =
@@ -405,16 +405,16 @@ public void mouseClicked(MouseEvent e) {
     d = codeCompletionBox.getPreferredSize();
     codeCompletionBox.setBounds(left, top, d.width + 10, d.height);
     codeCompletionBox.addActionListener(new ActionListener() {
-      
+
       @Override
       public void actionPerformed(ActionEvent e) {
-        // Disble code completion trigger option if CC is disabled
+        // Disble code completion trigger option if completion is disabled
         codeCompletionTriggerBox.setEnabled(codeCompletionBox.isSelected());
       }
     });
-    
-    int toggleLeft = left + d.width;    
-    
+
+    int toggleLeft = left + d.width;
+
     // [ ] Toggle Code Completion Trigger - PDE X
 
     codeCompletionTriggerBox =
@@ -434,7 +434,7 @@ public void actionPerformed(ActionEvent e) {
     importSuggestionsBox.setBounds(left, top, d.width + 10, d.height);
     right = Math.max(right, left + d.width);
     top += d.height + GUI_BETWEEN;
-    
+
     // [ ] Increase maximum available memory to [______] MB
 
     Container memoryBox = Box.createHorizontalBox();
@@ -464,8 +464,8 @@ public void stateChanged(ChangeEvent e) {
     deletePreviousBox.setBounds(left, top, d.width + 10, d.height);
     right = Math.max(right, left + d.width);
     top += d.height + GUI_BETWEEN;
-    
-    
+
+
     // [ ] Hide tab/toolbar background image
 
     whinyBox = new JCheckBox(Language.text("preferences.hide_toolbar_background_image")+
@@ -501,7 +501,7 @@ public void stateChanged(ChangeEvent e) {
     d = displayBox.getPreferredSize();
     displayBox.setBounds(left, top, d.width, d.height);
     top += d.height + GUI_BETWEEN;
-    
+
 
     // [ ] Automatically associate .pde files with Processing
 
@@ -669,7 +669,7 @@ protected void applyFrame() {
     boolean wine = whinyBox.isSelected();
     Preferences.setBoolean("header.hide.image", wine); //$NON-NLS-1$
     Preferences.setBoolean("buttons.hide.image", wine); //$NON-NLS-1$
-    // Could iterate through editors here and repaint them all, but probably 
+    // Could iterate through editors here and repaint them all, but probably
     // requires a doLayout() call, and that may have different effects on
     // each platform, and nobody wants to debug/support that.
 
@@ -682,7 +682,7 @@ protected void applyFrame() {
 
 //    setBoolean("editor.external", externalEditorBox.isSelected());
     Preferences.setBoolean("update.check", checkUpdatesBox.isSelected()); //$NON-NLS-1$
-    
+
     // Save Language
     Map<String, String> languages = Language.getLanguages();
     String language = "";
@@ -695,7 +695,7 @@ protected void applyFrame() {
     if (!language.equals(Language.getLanguage()) && !language.equals("")) {
       Language.saveLanguage(language);
     }
-    
+
     int oldDisplayIndex = Preferences.getInteger("run.display"); //$NON-NLS-1$
     int displayIndex = 0;
     for (int d = 0; d < displaySelectionBox.getItemCount(); d++) {
@@ -740,7 +740,7 @@ protected void applyFrame() {
       Base.log("Ignoring invalid font size " + fontSizeField); //$NON-NLS-1$
       fontSizeField.setSelectedItem(Preferences.getInteger("editor.font.size"));
     }
-    
+
     try {
       Object selection = consoleSizeField.getSelectedItem();
       if (selection instanceof String) {
@@ -753,22 +753,22 @@ protected void applyFrame() {
       Base.log("Ignoring invalid font size " + consoleSizeField); //$NON-NLS-1$
       consoleSizeField.setSelectedItem(Preferences.getInteger("console.font.size"));
     }
-    
+
     Preferences.setColor("run.present.bgcolor", presentColor.getBackground());
-    
+
     Preferences.setBoolean("editor.input_method_support", inputMethodBox.isSelected()); //$NON-NLS-1$
 
     if (autoAssociateBox != null) {
       Preferences.setBoolean("platform.auto_file_type_associations", //$NON-NLS-1$
                              autoAssociateBox.isSelected());
     }
-    
+
     Preferences.setBoolean("pdex.errorCheckEnabled", errorCheckerBox.isSelected());
     Preferences.setBoolean("pdex.warningsEnabled", warningsCheckerBox.isSelected());
-    Preferences.setBoolean("pdex.ccEnabled", codeCompletionBox.isSelected());
-    Preferences.setBoolean("pdex.ccTriggerEnabled", codeCompletionTriggerBox.isSelected());
+    Preferences.setBoolean("pdex.completion", codeCompletionBox.isSelected());
+    Preferences.setBoolean("pdex.completion.trigger", codeCompletionTriggerBox.isSelected());
     Preferences.setBoolean("pdex.importSuggestEnabled", importSuggestionsBox.isSelected());
-    
+
     for (Editor editor : base.getEditors()) {
       editor.applyPreferences();
     }
@@ -780,8 +780,8 @@ protected void showFrame() {
     inputMethodBox.setSelected(Preferences.getBoolean("editor.input_method_support")); //$NON-NLS-1$
     errorCheckerBox.setSelected(Preferences.getBoolean("pdex.errorCheckEnabled"));
     warningsCheckerBox.setSelected(Preferences.getBoolean("pdex.warningsEnabled"));
-    codeCompletionBox.setSelected(Preferences.getBoolean("pdex.ccEnabled"));
-    codeCompletionTriggerBox.setSelected(Preferences.getBoolean("pdex.ccTriggerEnabled"));
+    codeCompletionBox.setSelected(Preferences.getBoolean("pdex.completion"));
+    codeCompletionTriggerBox.setSelected(Preferences.getBoolean("pdex.completion.trigger"));
     codeCompletionTriggerBox.setEnabled(codeCompletionBox.isSelected());
     importSuggestionsBox.setSelected(Preferences.getBoolean("pdex.importSuggestEnabled"));
     deletePreviousBox.
@@ -798,20 +798,20 @@ protected void showFrame() {
     if (displayNum >= 0 && displayNum < displayCount) {
       displaySelectionBox.setSelectedIndex(displayNum);
     }
-    
+
     // This takes a while to load, so run it from a separate thread
     EventQueue.invokeLater(new Runnable() {
       public void run() {
         initFontList();
       }
     });
-    
+
     fontSizeField.setSelectedItem(Preferences.getInteger("editor.font.size"));
     consoleSizeField.setSelectedItem(Preferences.getInteger("console.font.size"));
 
     presentColor.setBackground(Preferences.getColor("run.present.bgcolor"));
     presentColorHex.setText(Preferences.get("run.present.bgcolor").substring(1));
-    
+
     memoryOverrideBox.
       setSelected(Preferences.getBoolean("run.options.memory")); //$NON-NLS-1$
     memoryField.
@@ -827,7 +827,7 @@ public void run() {
   }
 
 
-  /** 
+  /**
    * 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, are you listening?
@@ -842,22 +842,22 @@ public Component getListCellRendererComponent(JList<? extends Font> list,
       return this;
     }
   }
-  
+
 
   void initFontList() {
     if (monoFontFamilies == null) {
       monoFontFamilies = Toolkit.getMonoFontFamilies();
       fontSelectionBox.setModel(new DefaultComboBoxModel(monoFontFamilies));
       String family = Preferences.get("editor.font.family");
 
-      // Set a reasonable default, in case selecting the family fails 
+      // Set a reasonable default, in case selecting the family fails
       fontSelectionBox.setSelectedItem("Monospaced");
       fontSelectionBox.setSelectedItem(family);
       fontSelectionBox.setEnabled(true);
     }
   }
-  
-  
+
+
   void updateDisplayList() {
     GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
     displayCount = ge.getScreenDevices().length;
