From 989e597f3daa798b71a7f3b0d157c7fc3cdef60c Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 5 Nov 2013 11:56:34 +0100 Subject: [PATCH] in power save mode, display a hint in settings that autopopup completion and automake don't work (IDEA-115749, IDEA-102048) --- .../intellij/compiler/options/CompilerUIConfigurable.java | 5 +++++ .../intellij/application/options/CodeCompletionPanel.java | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java index b97a10386568..0e8f7bdaa370 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java @@ -20,6 +20,7 @@ import com.intellij.compiler.CompilerConfigurationImpl; import com.intellij.compiler.CompilerWorkspaceConfiguration; import com.intellij.compiler.MalformedPatternException; import com.intellij.compiler.server.BuildManager; +import com.intellij.ide.PowerSaveMode; import com.intellij.openapi.compiler.CompilerBundle; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.options.Configurable; @@ -165,6 +166,10 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura configuration.convertPatterns(); myResourcePatternsField.setText(patternsToString(configuration.getResourceFilePatterns())); + + myEnableAutomakeLegendLabel.setText("(only works while not running / debugging" + + (PowerSaveMode.isEnabled() ? ", disabled in Power Save mode" : "") + + ")"); } private static String patternsToString(final String[] patterns) { diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java index 8cf79dfbd4d3..8e8eba54cbf9 100644 --- a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java @@ -19,11 +19,11 @@ package com.intellij.application.options; import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.ide.DataManager; +import com.intellij.ide.PowerSaveMode; import com.intellij.ide.ui.UISettings; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.IdeActions; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.project.Project; @@ -144,6 +144,8 @@ public class CodeCompletionPanel { myCbAutocompletion.setSelected(codeInsightSettings.AUTO_POPUP_COMPLETION_LOOKUP); myCbSorting.setSelected(UISettings.getInstance().SORT_LOOKUP_ELEMENTS_LEXICOGRAPHICALLY); + + myCbAutocompletion.setText("Autopopup code completion" + (PowerSaveMode.isEnabled() ? " (not available in Power Save mode)" : "")); } public void apply() {