diff --git a/java/debugger/impl/src/com/intellij/debugger/memory/ui/ClassesFilteredView.java b/java/debugger/impl/src/com/intellij/debugger/memory/ui/ClassesFilteredView.java index d147d3356f78..d25eb97d4f6c 100644 --- a/java/debugger/impl/src/com/intellij/debugger/memory/ui/ClassesFilteredView.java +++ b/java/debugger/impl/src/com/intellij/debugger/memory/ui/ClassesFilteredView.java @@ -276,7 +276,7 @@ public class ClassesFilteredView extends BorderLayoutPanel implements Disposable final DefaultActionGroup group = (DefaultActionGroup)ActionManager.getInstance().getAction("MemoryView.SettingsPopupActionGroup"); group.setPopup(true); final Presentation actionsPresentation = new Presentation("Memory View Settings"); - actionsPresentation.setIcon(AllIcons.General.SecondaryGroup); + actionsPresentation.setIcon(AllIcons.General.GearPlain); final ActionButton button = new ActionButton(group, actionsPresentation, ActionPlaces.UNKNOWN, new JBDimension(25, 25)); final BorderLayoutPanel topPanel = new BorderLayoutPanel(); diff --git a/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java index 6f4488d3b5a3..05803a40a124 100644 --- a/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.diff.actions.impl; import com.intellij.diff.tools.util.SyncScrollSupport; @@ -43,7 +29,7 @@ public class SetEditorSettingsAction extends ActionGroup implements DumbAware { public SetEditorSettingsAction(@NotNull TextDiffSettings settings, @NotNull List editors) { - super("Editor Settings", null, AllIcons.General.SecondaryGroup); + super("Editor Settings", null, AllIcons.General.GearPlain); setPopup(true); myTextSettings = settings; myEditors = editors; diff --git a/platform/icons/src/general/gearPlain.svg b/platform/icons/src/general/gearPlain.svg new file mode 100644 index 000000000000..933990e85d15 --- /dev/null +++ b/platform/icons/src/general/gearPlain.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/general/gearPlain_dark.svg b/platform/icons/src/general/gearPlain_dark.svg new file mode 100644 index 000000000000..fc551ad0dd04 --- /dev/null +++ b/platform/icons/src/general/gearPlain_dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/general/icon-robots.txt b/platform/icons/src/general/icon-robots.txt index d8af00a2806b..7228eeff4bfb 100644 --- a/platform/icons/src/general/icon-robots.txt +++ b/platform/icons/src/general/icon-robots.txt @@ -1 +1,3 @@ deprecated: debug.png -> /actions/startDebugger.png +deprecated: projectSettings.png -> /general/gearPlain.png +deprecated: secondaryGroup.png -> /general/gearPlain.png diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java index 5b53440d183a..b2bfefae7a34 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java @@ -1485,7 +1485,7 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr private MyShowSettingsButton(AnAction action, Presentation presentation, String place, @NotNull Dimension minimumSize) { super(action, presentation, place, minimumSize); - myPresentation.setIcon(AllIcons.General.SecondaryGroup); + myPresentation.setIcon(AllIcons.General.GearPlain); } } diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java index 82e31a0eb4d8..ec9017769548 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java @@ -481,7 +481,7 @@ public class FindPopupPanel extends JBPanel implements FindUI { }); tabResultsContextGroup.setPopup(true); Presentation tabSettingsPresentation = new Presentation(); - tabSettingsPresentation.setIcon(AllIcons.General.SecondaryGroup); + tabSettingsPresentation.setIcon(AllIcons.General.GearPlain); myTabResultsButton = new ActionButton(tabResultsContextGroup, tabSettingsPresentation, ActionPlaces.UNKNOWN, ActionToolbar.DEFAULT_MINIMUM_BUTTON_SIZE); new AnAction() { diff --git a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java index 05e033ba1e64..6bdbb6717f7f 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java +++ b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java @@ -627,7 +627,7 @@ public class FileStructurePopup implements Disposable, TreeActionsOwner { @NotNull protected JComponent createSettingsButton() { - JLabel label = new JLabel(AllIcons.General.SecondaryGroup); + JLabel label = new JLabel(AllIcons.General.GearPlain); label.setBorder(JBUI.Borders.empty(0, 2)); label.setHorizontalAlignment(SwingConstants.RIGHT); label.setVerticalAlignment(SwingConstants.CENTER); diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java index d641429b814a..6cc146735e7f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java @@ -176,7 +176,7 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar, QuickAct setLayout(new BorderLayout()); setOrientation(horizontal ? SwingConstants.HORIZONTAL : SwingConstants.VERTICAL); - mySecondaryActions.getTemplatePresentation().setIcon(AllIcons.General.SecondaryGroup); + mySecondaryActions.getTemplatePresentation().setIcon(AllIcons.General.GearPlain); mySecondaryActions.setPopup(true); myUpdater.updateActions(updateActionsNow, false); diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/settings/DiffMergeSettingsAction.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/settings/DiffMergeSettingsAction.java index 5138770ce6bb..483f0574fca4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/settings/DiffMergeSettingsAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/settings/DiffMergeSettingsAction.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.diff.impl.settings; import com.intellij.icons.AllIcons; @@ -38,7 +24,7 @@ public class DiffMergeSettingsAction extends ActionGroup { @NotNull private final DiffMergeSettings mySettings; public DiffMergeSettingsAction(@NotNull Collection editors, @NotNull DiffMergeSettings settings) { - super("Settings", null, AllIcons.General.SecondaryGroup); + super("Settings", null, AllIcons.General.GearPlain); setPopup(true); myEditors = editors; mySettings = settings; diff --git a/platform/platform-resources/src/idea/ExternalSystemActions.xml b/platform/platform-resources/src/idea/ExternalSystemActions.xml index 05cd300aae3e..03a1b28d2c10 100644 --- a/platform/platform-resources/src/idea/ExternalSystemActions.xml +++ b/platform/platform-resources/src/idea/ExternalSystemActions.xml @@ -19,7 +19,7 @@ use-shortcut-of="EditSource"/> + icon="AllIcons.General.GearPlain"> - + diff --git a/platform/platform-resources/src/idea/VcsActions.xml b/platform/platform-resources/src/idea/VcsActions.xml index c82ed6b03318..2daeefc68f5c 100644 --- a/platform/platform-resources/src/idea/VcsActions.xml +++ b/platform/platform-resources/src/idea/VcsActions.xml @@ -178,7 +178,7 @@ + text="Shelf Settings" description="Open shelf settings" icon="AllIcons.General.GearPlain"/> diff --git a/platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java b/platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java index 8a28970d8ad8..a0807b3be99c 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.execution.testframework; @@ -107,7 +93,7 @@ public class ToolbarPanel extends JPanel implements OccurenceNavigator, Disposab final DefaultActionGroup secondaryGroup = new DefaultActionGroup(); secondaryGroup.setPopup(true); - secondaryGroup.getTemplatePresentation().setIcon(AllIcons.General.SecondaryGroup); + secondaryGroup.getTemplatePresentation().setIcon(AllIcons.General.GearPlain); secondaryGroup.add(new DumbAwareToggleBooleanProperty(ExecutionBundle.message("junit.runing.info.track.test.action.name"), ExecutionBundle.message("junit.runing.info.track.test.action.description"), null, properties, TestConsoleProperties.TRACK_RUNNING_TEST)); diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java index dd4a894a6c4f..db354da5177b 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java @@ -1,6 +1,4 @@ -/* - * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.usages.impl; import com.intellij.find.FindManager; @@ -849,7 +847,7 @@ public class UsageViewImpl implements UsageViewEx { if (description == null) { description = "Show find usages settings dialog"; } - return new AnAction("Settings...", description, AllIcons.General.ProjectSettings) { + return new AnAction("Settings...", description, AllIcons.General.GearPlain) { { KeyboardShortcut shortcut = configurableUsageTarget == null ? getShowUsagesWithSettingsShortcut() : configurableUsageTarget.getShortcut(); if (shortcut != null) { diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index 0ab2fc6615ed..9011487acc2c 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -570,7 +570,10 @@ public class AllIcons { public static final Icon ProjectConfigurable = IconLoader.getIcon("/general/projectConfigurable.png"); // 9x9 public static final Icon ProjectConfigurableBanner = IconLoader.getIcon("/general/projectConfigurableBanner.png"); // 9x9 public static final Icon ProjectConfigurableSelected = IconLoader.getIcon("/general/projectConfigurableSelected.png"); // 9x9 - public static final Icon ProjectSettings = IconLoader.getIcon("/general/projectSettings.png"); // 16x16 + + @SuppressWarnings("unused") + @Deprecated + public static final Icon ProjectSettings = IconLoader.getIcon("/general/gearPlain.png"); // 16x16 public static final Icon ProjectStructure = IconLoader.getIcon("/general/projectStructure.png"); // 16x16 public static final Icon ProjectTab = IconLoader.getIcon("/general/projectTab.png"); // 16x16 public static final Icon QuestionDialog = IconLoader.getIcon("/general/questionDialog.png"); // 32x32 @@ -582,7 +585,10 @@ public class AllIcons { public static final Icon RunWithCoverage = IconLoader.getIcon("/general/runWithCoverage.png"); // 16x16 public static final Icon SafeMode = IconLoader.getIcon("/general/safeMode.png"); // 13x13 public static final Icon SearchEverywhereGear = IconLoader.getIcon("/general/searchEverywhereGear.png"); // 16x16 - public static final Icon SecondaryGroup = IconLoader.getIcon("/general/secondaryGroup.png"); // 16x16 + + @SuppressWarnings("unused") + @Deprecated + public static final Icon SecondaryGroup = IconLoader.getIcon("/general/gearPlain.png"); // 16x16 public static final Icon SeparatorH = IconLoader.getIcon("/general/separatorH.png"); // 17x11 public static final Icon Settings = IconLoader.getIcon("/general/settings.png"); // 16x16 public static final Icon Show_to_implement = IconLoader.getIcon("/general/show_to_implement.png"); // 16x16 diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml index c0337da58d7a..7b559277cf7a 100644 --- a/plugins/maven/src/main/resources/META-INF/plugin.xml +++ b/plugins/maven/src/main/resources/META-INF/plugin.xml @@ -452,7 +452,7 @@ + icon="AllIcons.General.GearPlain">