From 8e696241d92f33d8004f5d1015229e02f0dedfb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Mon, 27 Mar 2023 14:09:44 +0200 Subject: [PATCH] remove obsolete "Preferences" term usage --- .../src/main/resources/META-INF/plugin.xml | 8 ++++---- .../src/main/resources/META-INF/plugin.xml | 12 ++++++------ .../src/main/resources/META-INF/plugin.xml | 10 +++++----- .../src/main/resources/META-INF/plugin.xml | 6 +++--- .../org/intellij/sdk/facet/DemoFacetEditorTab.java | 4 ++-- .../src/main/resources/META-INF/plugin.xml | 8 ++++---- .../src/main/resources/META-INF/plugin.xml | 8 ++++---- .../src/main/resources/META-INF/plugin.xml | 8 ++++---- .../src/main/resources/META-INF/plugin.xml | 10 +++++----- .../src/main/resources/META-INF/plugin.xml | 8 ++++---- .../module/src/main/resources/META-INF/plugin.xml | 6 +++--- .../src/main/resources/META-INF/plugin.xml | 8 ++++---- .../src/main/resources/META-INF/plugin.xml | 6 +++--- .../src/main/resources/META-INF/plugin.xml | 8 ++++---- .../src/main/resources/META-INF/plugin.xml | 8 ++++---- .../psi_demo/src/main/resources/META-INF/plugin.xml | 8 ++++---- .../src/main/resources/META-INF/plugin.xml | 8 ++++---- .../settings/src/main/resources/META-INF/plugin.xml | 6 +++--- .../src/main/resources/META-INF/plugin.xml | 6 +++--- .../theme_basics/resources/META-INF/plugin.xml | 4 ++-- .../src/main/resources/META-INF/plugin.xml | 6 +++--- .../src/main/resources/META-INF/plugin.xml | 8 ++++---- .../basics/getting_started/theme/deploying_theme.md | 6 +++--- .../basics/getting_started/theme/theme_structure.md | 6 +++--- topics/basics/getting_started/theme/themes_extras.md | 2 +- topics/basics/plugin_structure/plugin_icon_file.md | 2 +- topics/intro/code_samples.md | 4 ++-- .../syntax_highlighting_and_error_highlighting.md | 2 +- 28 files changed, 93 insertions(+), 93 deletions(-) diff --git a/code_samples/action_basics/src/main/resources/META-INF/plugin.xml b/code_samples/action_basics/src/main/resources/META-INF/plugin.xml index 35a9c2655..cc6a152de 100644 --- a/code_samples/action_basics/src/main/resources/META-INF/plugin.xml +++ b/code_samples/action_basics/src/main/resources/META-INF/plugin.xml @@ -1,4 +1,4 @@ - + @@ -6,13 +6,13 @@ org.intellij.sdk.action - + SDK: Action Sample com.intellij.modules.platform - + Adds entries to the Tools menu. @@ -28,7 +28,7 @@ ]]> - + IntelliJ Platform SDK diff --git a/code_samples/comparing_string_references_inspection/src/main/resources/META-INF/plugin.xml b/code_samples/comparing_string_references_inspection/src/main/resources/META-INF/plugin.xml index bc0938d7f..6a6bc457f 100644 --- a/code_samples/comparing_string_references_inspection/src/main/resources/META-INF/plugin.xml +++ b/code_samples/comparing_string_references_inspection/src/main/resources/META-INF/plugin.xml @@ -6,18 +6,18 @@ org.intellij.sdk.codeInspection - + SDK: Comparing References Inspection Sample com.intellij.modules.platform com.intellij.java - + Adds entries to - Preferences | Editor | Inspections | Java | Probable Bugs. + Settings | Editor | Inspections | Java | Probable Bugs. ]]> @@ -30,7 +30,7 @@ ]]> - + IntelliJ Platform SDK @@ -45,9 +45,9 @@ - language - inspection language ID - shortName - not specified, will be computed by the underlying implementation classes - bundle - name of the message bundle for the "key" attribute - - key - the key of the message to be shown in the Preferences | Editor | Inspections panel + - key - the key of the message to be shown in the Settings | Editor | Inspections panel - groupPath - defines the outermost grouping for this inspection in - the Preferences | Editor | Inspections panel. Not localized. + the Settings | Editor | Inspections panel. Not localized. - groupBundle - the name of a message bundle file to translate groupKey In this case, reuse an IntelliJ Platform bundle file from intellij.platform.resources.en - groupKey - the key to use for translation subgroup name using groupBundle file. diff --git a/code_samples/conditional_operator_intention/src/main/resources/META-INF/plugin.xml b/code_samples/conditional_operator_intention/src/main/resources/META-INF/plugin.xml index 7925eee9e..cbf93deb5 100644 --- a/code_samples/conditional_operator_intention/src/main/resources/META-INF/plugin.xml +++ b/code_samples/conditional_operator_intention/src/main/resources/META-INF/plugin.xml @@ -1,4 +1,4 @@ - + @@ -6,18 +6,18 @@ org.intellij.sdk.intention - + SDK: Conditional Operator Converter com.intellij.java com.intellij.modules.platform - + - Adds entry to Preferences | Editor | Intentions | SDK Intentions. + Adds entry to Settings | Editor | Intentions | SDK Intentions. ]]> @@ -30,7 +30,7 @@ ]]> - + IntelliJ Platform SDK diff --git a/code_samples/editor_basics/src/main/resources/META-INF/plugin.xml b/code_samples/editor_basics/src/main/resources/META-INF/plugin.xml index 12fd27d86..10f5863e6 100644 --- a/code_samples/editor_basics/src/main/resources/META-INF/plugin.xml +++ b/code_samples/editor_basics/src/main/resources/META-INF/plugin.xml @@ -6,13 +6,13 @@ org.intellij.sdk.editor - + SDK: Editor Sample com.intellij.modules.platform - + - + IntelliJ Platform SDK diff --git a/code_samples/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetEditorTab.java b/code_samples/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetEditorTab.java index 84d95ae4c..57f1952c2 100644 --- a/code_samples/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetEditorTab.java +++ b/code_samples/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetEditorTab.java @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2023 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.intellij.sdk.facet; @@ -37,7 +37,7 @@ public class DemoFacetEditorTab extends FacetEditorTab { } /** - * Provides the {@link JPanel} displayed in the Preferences | Facet UI + * Provides the {@link JPanel} displayed in the Project Structure | Facet UI * * @return {@link JPanel} to be displayed in the {@link DemoFacetEditorTab}. */ diff --git a/code_samples/facet_basics/src/main/resources/META-INF/plugin.xml b/code_samples/facet_basics/src/main/resources/META-INF/plugin.xml index 413bf3db5..8ed8af7d8 100644 --- a/code_samples/facet_basics/src/main/resources/META-INF/plugin.xml +++ b/code_samples/facet_basics/src/main/resources/META-INF/plugin.xml @@ -1,4 +1,4 @@ - + @@ -6,13 +6,13 @@ org.intellij.sdk.facet - + SDK: Facet Basics com.intellij.modules.lang - + Adds SDK Facet @@ -27,7 +27,7 @@ ]]> - + IntelliJ Platform SDK diff --git a/code_samples/framework_basics/src/main/resources/META-INF/plugin.xml b/code_samples/framework_basics/src/main/resources/META-INF/plugin.xml index e1eeaf291..5cd60273b 100644 --- a/code_samples/framework_basics/src/main/resources/META-INF/plugin.xml +++ b/code_samples/framework_basics/src/main/resources/META-INF/plugin.xml @@ -1,4 +1,4 @@ - + @@ -6,14 +6,14 @@ org.intellij.sdk.framework - + SDK: Framework Sample com.intellij.modules.platform com.intellij.java - + Adds SDK Demo Framework to @@ -29,7 +29,7 @@ ]]> - + IntelliJ Platform SDK diff --git a/code_samples/kotlin_demo/src/main/resources/META-INF/plugin.xml b/code_samples/kotlin_demo/src/main/resources/META-INF/plugin.xml index 0b19e08a6..6dd71b1a2 100644 --- a/code_samples/kotlin_demo/src/main/resources/META-INF/plugin.xml +++ b/code_samples/kotlin_demo/src/main/resources/META-INF/plugin.xml @@ -1,4 +1,4 @@ - + @@ -6,13 +6,13 @@ org.intellij.sdk.kotlin - + SDK: Kotlin Demo com.intellij.modules.platform - + Greeting menu group anchored last in the Main Menu @@ -27,7 +27,7 @@ ]]> - + IntelliJ Platform SDK diff --git a/code_samples/live_templates/src/main/resources/META-INF/plugin.xml b/code_samples/live_templates/src/main/resources/META-INF/plugin.xml index 76f7bab65..340bd2a60 100644 --- a/code_samples/live_templates/src/main/resources/META-INF/plugin.xml +++ b/code_samples/live_templates/src/main/resources/META-INF/plugin.xml @@ -1,4 +1,4 @@ - + @@ -6,17 +6,17 @@ org.intellij.sdk.liveTemplates - + SDK: Live Templates Sample com.intellij.modules.lang - + Adds an entry to the - Preferences | Editor | Live Templates dialog. + Settings | Editor | Live Templates dialog. ]]> @@ -29,7 +29,7 @@ ]]> - + IntelliJ Platform SDK diff --git a/code_samples/max_opened_projects/src/main/resources/META-INF/plugin.xml b/code_samples/max_opened_projects/src/main/resources/META-INF/plugin.xml index 2c818c676..355fd9b5f 100644 --- a/code_samples/max_opened_projects/src/main/resources/META-INF/plugin.xml +++ b/code_samples/max_opened_projects/src/main/resources/META-INF/plugin.xml @@ -1,4 +1,4 @@ - + @@ -6,13 +6,13 @@ org.intellij.sdk.maxOpenProjects - + SDK: Maximum Open Projects Sample com.intellij.modules.platform - + - + IntelliJ Platform SDK diff --git a/code_samples/module/src/main/resources/META-INF/plugin.xml b/code_samples/module/src/main/resources/META-INF/plugin.xml index 7e258e6a4..bf1b785cb 100644 --- a/code_samples/module/src/main/resources/META-INF/plugin.xml +++ b/code_samples/module/src/main/resources/META-INF/plugin.xml @@ -6,13 +6,13 @@ org.intellij.sdk.module - + SDK: Module Type Sample com.intellij.modules.platform - + Adds SDK Demo Module to File | New | Project... @@ -27,7 +27,7 @@ ]]> - + IntelliJ Platform SDK diff --git a/code_samples/product_specific/pycharm_basics/src/main/resources/META-INF/plugin.xml b/code_samples/product_specific/pycharm_basics/src/main/resources/META-INF/plugin.xml index 2886b9703..ef4914780 100644 --- a/code_samples/product_specific/pycharm_basics/src/main/resources/META-INF/plugin.xml +++ b/code_samples/product_specific/pycharm_basics/src/main/resources/META-INF/plugin.xml @@ -1,4 +1,4 @@ - + @@ -6,13 +6,13 @@ org.intellij.sdk.pycharm - + SDK: PyCharm Sample com.intellij.modules.python - + - + IntelliJ Platform SDK diff --git a/code_samples/project_model/src/main/resources/META-INF/plugin.xml b/code_samples/project_model/src/main/resources/META-INF/plugin.xml index 0d67beb66..f3ffb6f85 100644 --- a/code_samples/project_model/src/main/resources/META-INF/plugin.xml +++ b/code_samples/project_model/src/main/resources/META-INF/plugin.xml @@ -6,14 +6,14 @@ org.intellij.sdk.project.model - + SDK: Project Model Sample com.intellij.modules.platform com.intellij.java - + Adds menu items to @@ -29,7 +29,7 @@ ]]> - + IntelliJ Platform SDK diff --git a/code_samples/project_view_pane/src/main/resources/META-INF/plugin.xml b/code_samples/project_view_pane/src/main/resources/META-INF/plugin.xml index 72ded3be0..40faf4093 100644 --- a/code_samples/project_view_pane/src/main/resources/META-INF/plugin.xml +++ b/code_samples/project_view_pane/src/main/resources/META-INF/plugin.xml @@ -1,4 +1,4 @@ - + @@ -6,13 +6,13 @@ org.intellij.sdk.view.pane - + SDK: Project View Pane Demo com.intellij.modules.platform - + - + IntelliJ Platform SDK diff --git a/code_samples/project_wizard/src/main/resources/META-INF/plugin.xml b/code_samples/project_wizard/src/main/resources/META-INF/plugin.xml index b7f437122..4abc603f0 100644 --- a/code_samples/project_wizard/src/main/resources/META-INF/plugin.xml +++ b/code_samples/project_wizard/src/main/resources/META-INF/plugin.xml @@ -1,4 +1,4 @@ - + @@ -6,13 +6,13 @@ org.intellij.sdk.project.wizard - + SDK: Project Wizard Demo com.intellij.modules.platform - + - + IntelliJ Platform SDK diff --git a/code_samples/psi_demo/src/main/resources/META-INF/plugin.xml b/code_samples/psi_demo/src/main/resources/META-INF/plugin.xml index 5e3cfa72a..20ea68093 100644 --- a/code_samples/psi_demo/src/main/resources/META-INF/plugin.xml +++ b/code_samples/psi_demo/src/main/resources/META-INF/plugin.xml @@ -1,4 +1,4 @@ - + @@ -6,14 +6,14 @@ org.intellij.sdk.psi - + SDK: PSI Demo com.intellij.modules.platform com.intellij.java - + - + IntelliJ Platform SDK diff --git a/code_samples/run_configuration/src/main/resources/META-INF/plugin.xml b/code_samples/run_configuration/src/main/resources/META-INF/plugin.xml index ceffe06e0..f823340e0 100644 --- a/code_samples/run_configuration/src/main/resources/META-INF/plugin.xml +++ b/code_samples/run_configuration/src/main/resources/META-INF/plugin.xml @@ -1,4 +1,4 @@ - + @@ -6,13 +6,13 @@ org.intellij.sdk.runConfiguration - + SDK: Run Configuration Demo com.intellij.modules.platform - + - + IntelliJ Platform SDK diff --git a/code_samples/settings/src/main/resources/META-INF/plugin.xml b/code_samples/settings/src/main/resources/META-INF/plugin.xml index fec37c097..1d3c6b92b 100644 --- a/code_samples/settings/src/main/resources/META-INF/plugin.xml +++ b/code_samples/settings/src/main/resources/META-INF/plugin.xml @@ -6,14 +6,14 @@ org.intellij.sdk.settings - + SDK: Settings Example com.intellij.modules.platform - + Adds a settings panel to the Settings @@ -28,7 +28,7 @@ ]]> - + IntelliJ Platform SDK diff --git a/code_samples/simple_language_plugin/src/main/resources/META-INF/plugin.xml b/code_samples/simple_language_plugin/src/main/resources/META-INF/plugin.xml index ab17560d9..37c9ec63f 100644 --- a/code_samples/simple_language_plugin/src/main/resources/META-INF/plugin.xml +++ b/code_samples/simple_language_plugin/src/main/resources/META-INF/plugin.xml @@ -6,14 +6,14 @@ org.intellij.sdk.language - + SDK: Simple Language Sample com.intellij.modules.platform com.intellij.java - + Defines a new language, @@ -33,7 +33,7 @@ ]]> - + IntelliJ Platform SDK diff --git a/code_samples/theme_basics/resources/META-INF/plugin.xml b/code_samples/theme_basics/resources/META-INF/plugin.xml index 3651d92c6..10bbefb63 100644 --- a/code_samples/theme_basics/resources/META-INF/plugin.xml +++ b/code_samples/theme_basics/resources/META-INF/plugin.xml @@ -6,7 +6,7 @@ org.intellij.sdk.themeBasics - + SDK: Theme Basics @@ -31,7 +31,7 @@ ]]> - + IntelliJ Platform SDK diff --git a/code_samples/tool_window/src/main/resources/META-INF/plugin.xml b/code_samples/tool_window/src/main/resources/META-INF/plugin.xml index 48ecd42e9..8ff087aaf 100644 --- a/code_samples/tool_window/src/main/resources/META-INF/plugin.xml +++ b/code_samples/tool_window/src/main/resources/META-INF/plugin.xml @@ -6,13 +6,13 @@ org.intellij.sdk.toolWindow - + SDK: Tool Window Sample com.intellij.modules.platform - + @@ -30,7 +30,7 @@ ]]> - + IntelliJ Platform SDK diff --git a/code_samples/tree_structure_provider/src/main/resources/META-INF/plugin.xml b/code_samples/tree_structure_provider/src/main/resources/META-INF/plugin.xml index 4d7844057..8811b5bf9 100644 --- a/code_samples/tree_structure_provider/src/main/resources/META-INF/plugin.xml +++ b/code_samples/tree_structure_provider/src/main/resources/META-INF/plugin.xml @@ -1,4 +1,4 @@ - + @@ -6,13 +6,13 @@ org.intellij.sdk.treeStructureProvider - + SDK: Tree Structure Provider Sample com.intellij.modules.platform - + - + IntelliJ Platform SDK diff --git a/topics/basics/getting_started/theme/deploying_theme.md b/topics/basics/getting_started/theme/deploying_theme.md index ab2dc03d6..4b3d845ff 100644 --- a/topics/basics/getting_started/theme/deploying_theme.md +++ b/topics/basics/getting_started/theme/deploying_theme.md @@ -1,6 +1,6 @@ -[//]: # (title: Deploying a Theme) +# Deploying a Theme - + Building and deploying a theme in IDE. @@ -16,6 +16,6 @@ The deployment process prepares the plugin artifact that can be installed in IDE In the case of developing a regular plugin, and it specifies additional dependencies, a ZIP archive is created, including all the plugin libraries. 3. [Install](https://www.jetbrains.com/help/idea/managing-plugins.html#installing-plugins-from-disk) the newly created JAR or ZIP file from disk. 4. Click the Apply button. -5. Select your theme in Preferences | Appearance & Behavior | Appearance and apply the changes. +5. Select your theme in Settings | Appearance & Behavior | Appearance and apply the changes. diff --git a/topics/basics/getting_started/theme/theme_structure.md b/topics/basics/getting_started/theme/theme_structure.md index 29bb9cb8f..96405c3bc 100644 --- a/topics/basics/getting_started/theme/theme_structure.md +++ b/topics/basics/getting_started/theme/theme_structure.md @@ -1,6 +1,6 @@ -[//]: # (title: Theme Structure) +# Theme Structure - + Overview of a theme plugin project structure and the most important elements. @@ -37,7 +37,7 @@ The content of the default file generated with the [Theme wizard](creating_theme } ``` -* `name` key matches the first portion of the Theme description $THEME_NAME$.theme.json file name. The value of `name` is displayed in the [Theme](https://www.jetbrains.com/help/idea/settings-appearance.html) Preferences dropdown when the theme's plugin is installed in the IDE. +* `name` key matches the first portion of the Theme description $THEME_NAME$.theme.json file name. The value of `name` is displayed in the [Theme](https://www.jetbrains.com/help/idea/settings-appearance.html) Settings dropdown when the theme's plugin is installed in the IDE. * `author` - specifies the theme author (empty by default). * `dark` - determines the base theme (_Light_ or _Darcula_) that is customized. * `editorScheme` - specifies the editor scheme file that describes fonts and colors used in editors (see [](themes_extras.md#adding-a-custom-editor-scheme) for more details). diff --git a/topics/basics/getting_started/theme/themes_extras.md b/topics/basics/getting_started/theme/themes_extras.md index 79f23f88e..8e2ebd61d 100644 --- a/topics/basics/getting_started/theme/themes_extras.md +++ b/topics/basics/getting_started/theme/themes_extras.md @@ -146,7 +146,7 @@ The wildcard portion of these patterns corresponds to the `usage` definitions ab ## Adding a Custom Background Image The IDE supports setting an image as a background in the application window. -Users can do this manually in [Preferences](https://www.jetbrains.com/help/idea/setting-background-image.html). +Users can do this manually in [Settings](https://www.jetbrains.com/help/idea/setting-background-image.html). Themes support specifying a background image as a key-value pair in the `"background": {}` (for editor and tools) and `"emptyFrameBackground": {}` (for empty frame) sections of a Theme description file: * The `image` key uses the file name of the image as the value. diff --git a/topics/basics/plugin_structure/plugin_icon_file.md b/topics/basics/plugin_structure/plugin_icon_file.md index f6a9612b4..62dc1ff55 100644 --- a/topics/basics/plugin_structure/plugin_icon_file.md +++ b/topics/basics/plugin_structure/plugin_icon_file.md @@ -13,7 +13,7 @@ Plugin Logos are shown in the [JetBrains Marketplace](https://plugins.jetbrains. They also appear in the Settings [Plugin Manager](https://www.jetbrains.com/help/idea/managing-plugins.html) UI in IntelliJ Platform-based IDEs. Whether online or in the product UI, a Plugin Logo helps users to identify a plugin more quickly in a list, as shown below: -![Example Product Plugin Preferences Dialog](plugin_prefs.png){width="800"} +![Example Product Plugin Settings Dialog](plugin_prefs.png){width="800"} > When browsing [custom plugin repositories](custom_plugin_repository.md), there is no support for showing logos for plugins hosted there but not yet installed. > diff --git a/topics/intro/code_samples.md b/topics/intro/code_samples.md index 8c35258e2..92a822733 100644 --- a/topics/intro/code_samples.md +++ b/topics/intro/code_samples.md @@ -1,6 +1,6 @@ # Code Samples - + Accessing SDK Docs code samples. @@ -29,7 +29,7 @@ Select the code sample(s) to import via the [Gradle tool window](https://www.jet Alternatively, import _all_ code samples available by choosing _gradleCompositeBuild, which links all Gradle projects in a Composite Build. After successful import, the project appears in the Gradle tool window tree as a new node. -Assign a Java 11 SDK in Preferences | Build, Execution, Deployment | Build Tools | Gradle for Gradle JVM. +Assign a Java 11 SDK in Settings | Build, Execution, Deployment | Build Tools | Gradle for Gradle JVM. Invoke Reload All Gradle Projects from the Gradle tool window toolbar if necessary. ## Running Code Samples diff --git a/topics/reference_guide/custom_language_support/syntax_highlighting_and_error_highlighting.md b/topics/reference_guide/custom_language_support/syntax_highlighting_and_error_highlighting.md index 2a536b2da..75ef250da 100644 --- a/topics/reference_guide/custom_language_support/syntax_highlighting_and_error_highlighting.md +++ b/topics/reference_guide/custom_language_support/syntax_highlighting_and_error_highlighting.md @@ -28,7 +28,7 @@ Highlighting from multiple `TextAttributesKey` items can be layered — for exam ## Color Settings The mapping of the `TextAttributesKey` to specific attributes used in an editor is defined by the [`EditorColorsScheme`](%gh-ic%/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsScheme.java) class. -It can be configured by the user via Preferences | Editor | Color Scheme by providing an implementation of [`ColorSettingPage`](%gh-ic%/platform/platform-api/src/com/intellij/openapi/options/colors/ColorSettingsPage.java) registered in `com.intellij.colorSettingsPage` extension point. +It can be configured by the user via Settings | Editor | Color Scheme by providing an implementation of [`ColorSettingPage`](%gh-ic%/platform/platform-api/src/com/intellij/openapi/options/colors/ColorSettingsPage.java) registered in `com.intellij.colorSettingsPage` extension point. To lookup external name for a setting in the IDE, use [UI Inspector](internal_ui_inspector.md#inspecting-settings). The File | Export | Files or Selection to HTML feature uses the same syntax highlighting mechanism as the editor.