eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-22 06:45:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/processing/processing.git into zh-languge

Browse Source
This commit is contained in:
liquidzym
2014-08-19 17:31:39 +08:00
parent 46c3289027 91679d072f
commit 24f821237a
8 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/processing/app/PreferencesFrame.java
View File

@@ -425,7 +425,16 @@ public class PreferencesFrame {
right = Math.max(right, toggleLeft + d.width);
top += d.height + GUI_BETWEEN;
// [ ] Show import suggestions - PDE X
importSuggestionsBox =
new JCheckBox(Language.text("preferences.suggest_imports"));
pain.add(importSuggestionsBox);
d = importSuggestionsBox.getPreferredSize();
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();
@@ -758,6 +767,8 @@ public class PreferencesFrame {
Preferences.setBoolean("pdex.warningsEnabled", warningsCheckerBox.isSelected());
Preferences.setBoolean("pdex.ccEnabled", codeCompletionBox.isSelected());
Preferences.setBoolean("pdex.ccTriggerEnabled", codeCompletionTriggerBox.isSelected());
Preferences.setBoolean("pdex.importSuggestEnabled", importSuggestionsBox.isSelected());
for (Editor editor : base.getEditors()) {
editor.applyPreferences();
}
@@ -772,6 +783,7 @@ public class PreferencesFrame {
codeCompletionBox.setSelected(Preferences.getBoolean("pdex.ccEnabled"));
codeCompletionTriggerBox.setSelected(Preferences.getBoolean("pdex.ccTriggerEnabled"));
codeCompletionTriggerBox.setEnabled(codeCompletionBox.isSelected());
importSuggestionsBox.setSelected(Preferences.getBoolean("pdex.importSuggestEnabled"));
deletePreviousBox.
setSelected(Preferences.getBoolean("export.delete_target_folder")); //$NON-NLS-1$

1
app/src/processing/app/languages/PDE.properties
View File

@@ -140,6 +140,7 @@ preferences.show_warnings = Show warnings
preferences.code_completion = Code completion
preferences.trigger_with = Trigger with
preferences.cmd_space = space
preferences.suggest_imports = Suggest import statements
preferences.increase_max_memory = Increase maximum available memory to
preferences.delete_previous_folder_on_export = Delete previous folder on export
preferences.hide_toolbar_background_image = Hide tab/toolbar background image