Skip to content

typo: renamed showPrerefencesData() to showPreferencesData() #8214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 21, 2018
Merged

typo: renamed showPrerefencesData() to showPreferencesData() #8214

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/src/cc/arduino/view/preferences/Preferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public Preferences(Window parent, Base base) {

Base.registerWindowCloseKeys(getRootPane(), this::cancelButtonActionPerformed);

showPrerefencesData();
showPreferencesData();
}

/**
Expand Down Expand Up @@ -180,7 +180,7 @@ private void initComponents() {

sketchbookLocationLabel.setText(tr("Sketchbook location:"));
sketchbookLocationLabel.setLabelFor(sketchbookLocationField);

sketchbookLocationField.setColumns(40);

browseButton.setText(I18n.PROMPT_BROWSE);
Expand All @@ -193,7 +193,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
comboLanguageLabel.setText(tr("Editor language: "));

requiresRestartLabel.setText(tr(" (requires restart of Arduino)"));

comboLanguage.getAccessibleContext().setAccessibleName("Editor language (requires restart of Arduino)");

fontSizeLabel.setText(tr("Editor font size: "));
Expand Down Expand Up @@ -307,7 +307,7 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) {
autoScaleCheckBox.getAccessibleContext().setAccessibleName("Automatic interface scale (requires restart of Arduino");

jLabel3.setText("%");

comboThemeLabel.setText(tr("Theme: "));

comboTheme.getAccessibleContext().setAccessibleName("Theme (requires restart of Arduino)");
Expand Down Expand Up @@ -793,7 +793,7 @@ private void savePreferencesData() {

Language newLanguage = (Language) comboLanguage.getSelectedItem();
PreferencesData.set("editor.languages.current", newLanguage.getIsoCode());

if (comboTheme.getSelectedIndex() == 0) {
PreferencesData.set("theme.file", "");
} else {
Expand Down Expand Up @@ -855,7 +855,7 @@ private void savePreferencesData() {
PreferencesData.set(Constants.PREF_PROXY_AUTO_PASSWORD, String.valueOf(autoProxyPassword.getPassword()));
}

private void showPrerefencesData() {
private void showPreferencesData() {
sketchbookLocationField.setText(PreferencesData.get("sketchbook.path"));

String currentLanguageISOCode = PreferencesData.get("editor.languages.current");
Expand All @@ -864,7 +864,7 @@ private void showPrerefencesData() {
comboLanguage.setSelectedItem(language);
}
}

String selectedTheme = PreferencesData.get("theme.file", "");
Collection<ZippedTheme> availablethemes = Theme.getAvailablethemes();
comboTheme.addItem(tr("Default theme"));
Expand Down