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

move colons into the language file

Browse Source
This commit is contained in:
Ben Fry
2022-05-02 21:52:57 -04:00
parent 374accfc70
commit 90599732f8
3 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/ui/PreferencesFrame.java
+19 -14
View File
@@ -119,7 +119,7 @@ public class PreferencesFrame {
// Sketchbook folder:
// [...............................] [ Browse ]
sketchbookLocationLabel = new JLabel(Language.text("preferences.sketchbook_location") + ":");
sketchbookLocationLabel = new JLabel(Language.text("preferences.sketchbook_location"));
sketchbookLocationField = new JTextField(25);
/*
@@ -147,7 +147,7 @@ public class PreferencesFrame {
// Language: [ English ] (requires restart of Processing)
JLabel languageLabel = new JLabel(Language.text("preferences.language") + ":");
JLabel languageLabel = new JLabel(Language.text("preferences.language"));
languageSelectionBox = new JComboBox<>();
Map<String, String> languages = Language.getLanguages();
@@ -170,7 +170,7 @@ public class PreferencesFrame {
// Editor and console font [ Source Code Pro ]
JLabel fontLabel = new JLabel(Language.text("preferences.editor_and_console_font") + ":");
JLabel fontLabel = new JLabel(Language.text("preferences.editor_and_console_font"));
final String fontTip = "<html>" + Language.text("preferences.editor_and_console_font.tip");
fontLabel.setToolTipText(fontTip);
// get a wide name in there before getPreferredSize() is called
@@ -181,11 +181,11 @@ public class PreferencesFrame {
// Editor font size [ 12 ] Console font size [ 10 ]
JLabel fontSizeLabel = new JLabel(Language.text("preferences.editor_font_size") + ":");
JLabel fontSizeLabel = new JLabel(Language.text("preferences.editor_font_size"));
fontSizeField = new JComboBox<>(FONT_SIZES);
fontSizeField.setSelectedItem(Preferences.getInteger("editor.font.size"));
JLabel consoleFontSizeLabel = new JLabel(Language.text("preferences.console_font_size") + ":");
JLabel consoleFontSizeLabel = new JLabel(Language.text("preferences.console_font_size"));
consoleFontSizeField = new JComboBox<>(FONT_SIZES);
consoleFontSizeField.setSelectedItem(Preferences.getInteger("console.font.size"));
@@ -200,7 +200,7 @@ public class PreferencesFrame {
// zoomRestartLabel = new JLabel(Language.text("preferences.requires_restart"));
JLabel zoomLabel = new JLabel(Language.text("preferences.interface_scale") + ":");
JLabel zoomLabel = new JLabel(Language.text("preferences.interface_scale"));
zoomAutoBox = new JCheckBox(Language.text("preferences.interface_scale.auto"));
zoomAutoBox.addChangeListener(e -> {
@@ -225,14 +225,18 @@ public class PreferencesFrame {
// [ ] Keep sketch name and main tab name in sync
syncSketchNameBox =
new JCheckBox("<html>Keep sketch name and main tab in sync<br/>" +
"(disabling this is experimental: save carefully and report issues)");
syncSketchNameBox.setVerticalTextPosition(SwingConstants.TOP);
new JCheckBox("Keep sketch name and main tab in sync");
syncSketchNameBox.setToolTipText("<html>" +
"This removes the requirement for the sketch name to be<br>" +
"the same as the main tab, which makes it easier to use<br>" +
"Processing sketches with version control systems like Git.<br>" +
"This is experimental: save often and report any issues!");
//syncSketchNameBox.setVerticalTextPosition(SwingConstants.TOP);
// Colors
JLabel backgroundColorLabel = new JLabel(Language.text("preferences.background_color")+":");
JLabel backgroundColorLabel = new JLabel(Language.text("preferences.background_color"));
final String colorTip = "<html>" + Language.text("preferences.background_color.tip");
backgroundColorLabel.setToolTipText(colorTip);
@@ -373,7 +377,7 @@ public class PreferencesFrame {
// [ ] Increase maximum available memory to [______] MB
memoryOverrideBox = new JCheckBox(Language.text("preferences.increase_max_memory")+":");
memoryOverrideBox = new JCheckBox(Language.text("preferences.increase_max_memory"));
memoryField = new JTextField(4);
memoryOverrideBox.addChangeListener(e -> memoryField.setEnabled(memoryOverrideBox.isSelected()));
JLabel mbLabel = new JLabel("MB");
@@ -393,7 +397,7 @@ public class PreferencesFrame {
// Run sketches on display [ 1 ]
JLabel displayLabel = new JLabel(Language.text("preferences.run_sketches_on_display") + ":");
JLabel displayLabel = new JLabel(Language.text("preferences.run_sketches_on_display"));
final String tip = "<html>" + Language.text("preferences.run_sketches_on_display.tip");
displayLabel.setToolTipText(tip);
displaySelectionBox = new JComboBox<>();
@@ -409,7 +413,7 @@ public class PreferencesFrame {
// More preferences are in the ...
JLabel morePreferenceLabel = new JLabel(Language.text("preferences.file") + ":");
JLabel morePreferenceLabel = new JLabel(Language.text("preferences.file"));
//morePreferenceLabel.setForeground(Color.gray);
morePreferenceLabel.setEnabled(false);
@@ -435,7 +439,7 @@ public class PreferencesFrame {
}
});
JLabel preferenceHintLabel = new JLabel("(" + Language.text("preferences.file.hint") + ")");
JLabel preferenceHintLabel = new JLabel(Language.text("preferences.file.hint"));
//preferenceHintLabel.setForeground(Color.gray);
preferenceHintLabel.setEnabled(false);
@@ -466,6 +470,7 @@ public class PreferencesFrame {
addRow(layoutPanel, fontLabel, fontSelectionBox);
addRow(layoutPanel, fontSizeLabel, fontSizeField,
//Box.createHorizontalStrut(H_GAP), // uglier
consoleFontSizeLabel, consoleFontSizeField);
//addRow(layoutPanel, zoomLabel, zoomAutoBox, zoomSelectionBox, zoomRestartLabel);
build/shared/lib/languages/PDE.properties
+8 -9
View File
@@ -186,18 +186,17 @@ close.unsaved_changes = Save changes to %s?
# Preferences (Frame)
preferences = Preferences
preferences.button.width = 80
# preferences.requires_restart = requires restart of Processing
preferences.restart_required = Restart Processing to apply changes
preferences.sketchbook_location = Sketchbook folder
preferences.sketchbook_location.popup = Sketchbook folder
preferences.language = Language
preferences.editor_and_console_font = Editor and Console font
preferences.language = Language:
preferences.editor_and_console_font = Editor and Console font:
preferences.editor_and_console_font.tip = Select the font used in the Editor and the Console.<br>Only monospaced (fixed-width) fonts may be used,<br>though the list may be imperfect.
preferences.editor_font_size = Editor font size
preferences.console_font_size = Console font size
preferences.interface_scale = Scale
preferences.editor_font_size = Editor font size:
preferences.console_font_size = Console font size:
preferences.interface_scale = Interface scale:
preferences.interface_scale.auto = Automatic
preferences.background_color = Background color when Presenting
preferences.background_color = Background color when Presenting:
preferences.background_color.tip = Select the background color used when using Present.<br>Present is used to present a sketch in full-screen,<br>accessible from the Sketch menu.
preferences.use_smooth_text = Use smooth text in editor window
preferences.enable_complex_text = Enable complex text input
@@ -216,8 +215,8 @@ preferences.run_sketches_on_display.tip = Sets the display where sketches are in
preferences.automatically_associate_pde_files = Automatically associate .pde files with Processing
preferences.launch_programs_in = Launch programs in
preferences.launch_programs_in.mode = mode
preferences.file = More preferences can be edited directly in the file
preferences.file.hint = edit only when Processing is not running
preferences.file = More preferences can be edited directly in the file:
preferences.file.hint = (Edit only when Processing is not running.)
# Sketchbook Location (Frame)
sketchbook_location = Select new sketchbook folder
todo.txt
+1 -1
View File
@@ -89,6 +89,7 @@ X preferences.enable_complex_text.tip
X preferences.requires_restart = requires restart of Processing
X becomes preferecnes.restart_required = Restart Processing to apply changes
X put language & complex text on same line
X move colons into the language file
_ show hand cursor with links for labels
_ rearrange item order in PreferencesFrame
@@ -101,7 +102,6 @@ _ suggest imports
_ increase memory
_ move delete previous pref to the Export to Application window
_ get rid of the pref/just use the setting from export to app
_ move colons into the language file?
contrib
X Double-clicking a .pde file also opens an untitled/empty sketch