From f367dcb6e269f345b2f2505161540d19afb072f4 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Tue, 22 Jul 2014 20:59:39 +0400 Subject: [PATCH] IDEA-127666 Add tooltip to "Project Setting" icon --- .../openapi/options/newEditor/OptionsTree.java | 12 ++++++++++-- .../src/messages/OptionsBundle.properties | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java index 4b278de0a741..5524df2bb2cb 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java @@ -20,6 +20,7 @@ import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.openapi.Disposable; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurableGroup; +import com.intellij.openapi.options.OptionsBundle; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.options.ex.ConfigurableWrapper; import com.intellij.openapi.project.Project; @@ -403,9 +404,16 @@ public class OptionsTree extends JPanel implements Disposable, OptionsEditorColl myTextLabel.setBorder(new EmptyBorder(1,2,1,0)); } - myProjectIcon.setVisible(Registry.is("ide.file.settings.order.new") && getConfigurableProject(base) != null); - if (myProjectIcon.isVisible()) { + Project project = getConfigurableProject(base); + if (project != null && Registry.is("ide.file.settings.order.new")) { myProjectIcon.setBackground(selected ? getSelectionBackground() : getBackground()); + myProjectIcon.setVisible(true); + tree.setToolTipText(OptionsBundle.message(project.isDefault() + ? "configurable.default.project.tooltip" + : "configurable.current.project.tooltip")); + } else { + myProjectIcon.setVisible(false); + tree.setToolTipText(null); } return result; } diff --git a/platform/platform-resources-en/src/messages/OptionsBundle.properties b/platform/platform-resources-en/src/messages/OptionsBundle.properties index d10179c2f794..aa2d1047c66e 100644 --- a/platform/platform-resources-en/src/messages/OptionsBundle.properties +++ b/platform/platform-resources-en/src/messages/OptionsBundle.properties @@ -206,6 +206,9 @@ configurable.group.language.settings.display.name=Languages and Frameworks configurable.group.tools.settings.display.name=Tools configurable.group.null.settings.display.name=Other Settings +configurable.default.project.tooltip=For default project +configurable.current.project.tooltip=For current project + control.panel.classic.view.button=Classic &View options.page.modified.save.message.text=The page has been modified. Save changes made on this page? options.save.changes.message.title=Save Changes