Update AllIcons: use GearPlain instead of ProjectSettings and SecondaryGroup

2026-09-27 10:03:11 +07:00 · 2018-04-12 18:33:21 +03:00
parent b352e5b488
commit 1cca0626f2
19 changed files with 37 additions and 95 deletions
@@ -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();
@@ -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<? extends Editor> editors) {
-    super("Editor Settings", null, AllIcons.General.SecondaryGroup);
+    super("Editor Settings", null, AllIcons.General.GearPlain);
    setPopup(true);
    myTextSettings = settings;
    myEditors = editors;
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#737373" fill-rule="evenodd" d="M12.7078144,8.94092644 L14.1860171,10.0014962 C13.9015285,10.8814083 13.4345167,11.6792367 12.8296171,12.3503459 L11.1720587,11.6025852 C10.7002906,12.0182974 10.1462196,12.3427961 9.53742767,12.5484995 L9.35682478,14.3581758 C8.91920787,14.4511061 8.46531382,14.5 8,14.5 C7.53468618,14.5 7.08079213,14.4511061 6.64317522,14.3581758 L6.46257231,12.5484994 C5.85378047,12.3427959 5.29970962,12.0182972 4.82794166,11.6025851 L3.1703829,12.3503459 C2.5654833,11.6792367 2.0984715,10.8814083 1.8139829,10.0014962 L3.29218604,8.94092614 C3.23171292,8.63665953 3.20000005,8.32203335 3.20000005,8.00000024 C3.20000005,7.67796698 3.23171295,7.36334066 3.29218612,7.05907392 L1.8139829,5.99850385 C2.0984715,5.11859166 2.5654833,4.32076327 3.1703829,3.64965409 L4.82794202,4.39741509 C5.29970989,3.98170311 5.85378059,3.65720451 6.46257226,3.45150114 L6.64317522,1.64182422 C7.08079213,1.54889386 7.53468618,1.5 8,1.5 C8.46531382,1.5 8.91920787,1.54889386 9.35682478,1.64182422 L9.53742772,3.45150097 C10.1462195,3.65720431 10.7002903,3.98170292 11.1720583,4.39741495 L12.8296171,3.64965409 C13.4345167,4.32076327 13.9015285,5.11859166 14.1860171,5.99850385 L12.7078143,7.05907362 C12.7682875,7.36334046 12.8000004,7.67796687 12.8000004,8.00000024 C12.8000004,8.32203346 12.7682875,8.63665973 12.7078144,8.94092644 Z M7.99999976,10.3003956 C9.27025466,10.3003956 10.2999997,9.27056196 10.2999997,8.00019773 C10.2999997,6.72983349 9.27025466,5.69999981 7.99999976,5.69999981 C6.72974486,5.69999981 5.69999981,6.72983349 5.69999981,8.00019773 C5.69999981,9.27056196 6.72974486,10.3003956 7.99999976,10.3003956 Z"/>
+</svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#AEAEAE" fill-rule="evenodd" d="M12.7078144,8.94092644 L14.1860171,10.0014962 C13.9015285,10.8814083 13.4345167,11.6792367 12.8296171,12.3503459 L11.1720587,11.6025852 C10.7002906,12.0182974 10.1462196,12.3427961 9.53742767,12.5484995 L9.35682478,14.3581758 C8.91920787,14.4511061 8.46531382,14.5 8,14.5 C7.53468618,14.5 7.08079213,14.4511061 6.64317522,14.3581758 L6.46257231,12.5484994 C5.85378047,12.3427959 5.29970962,12.0182972 4.82794166,11.6025851 L3.1703829,12.3503459 C2.5654833,11.6792367 2.0984715,10.8814083 1.8139829,10.0014962 L3.29218604,8.94092614 C3.23171292,8.63665953 3.20000005,8.32203335 3.20000005,8.00000024 C3.20000005,7.67796698 3.23171295,7.36334066 3.29218612,7.05907392 L1.8139829,5.99850385 C2.0984715,5.11859166 2.5654833,4.32076327 3.1703829,3.64965409 L4.82794202,4.39741509 C5.29970989,3.98170311 5.85378059,3.65720451 6.46257226,3.45150114 L6.64317522,1.64182422 C7.08079213,1.54889386 7.53468618,1.5 8,1.5 C8.46531382,1.5 8.91920787,1.54889386 9.35682478,1.64182422 L9.53742772,3.45150097 C10.1462195,3.65720431 10.7002903,3.98170292 11.1720583,4.39741495 L12.8296171,3.64965409 C13.4345167,4.32076327 13.9015285,5.11859166 14.1860171,5.99850385 L12.7078143,7.05907362 C12.7682875,7.36334046 12.8000004,7.67796687 12.8000004,8.00000024 C12.8000004,8.32203346 12.7682875,8.63665973 12.7078144,8.94092644 Z M7.99999976,10.3003956 C9.27025466,10.3003956 10.2999997,9.27056196 10.2999997,8.00019773 C10.2999997,6.72983349 9.27025466,5.69999981 7.99999976,5.69999981 C6.72974486,5.69999981 5.69999981,6.72983349 5.69999981,8.00019773 C5.69999981,9.27056196 6.72974486,10.3003956 7.99999976,10.3003956 Z"/>
+</svg>
@@ -1 +1,3 @@
 deprecated: debug.png -> /actions/startDebugger.png
+deprecated: projectSettings.png -> /general/gearPlain.png
+deprecated: secondaryGroup.png -> /general/gearPlain.png
@@ -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);
    }
  }

@@ -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() {
@@ -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);
@@ -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);
@@ -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<Editor> editors, @NotNull DiffMergeSettings settings) {
-    super("Settings", null, AllIcons.General.SecondaryGroup);
+    super("Settings", null, AllIcons.General.GearPlain);
    setPopup(true);
    myEditors = editors;
    mySettings = settings;
@@ -19,7 +19,7 @@
              use-shortcut-of="EditSource"/>
      <action id="ExternalSystem.ShowSettings"
              class="com.intellij.openapi.externalSystem.action.ShowExternalSystemSettingsAction"
-              icon="AllIcons.General.ProjectSettings">
+              icon="AllIcons.General.GearPlain">
      </action>

      <action id="ExternalSystem.ToggleAutoImport"
@@ -853,7 +853,7 @@
      <reference ref="EditorToggleUseSoftWraps"/>
    </group>

-    <group id="XDebugger.Settings" icon="AllIcons.General.SecondaryGroup" popup="true">
+    <group id="XDebugger.Settings" icon="AllIcons.General.GearPlain" popup="true">
      <action id="XDebugger.Inline" class="com.intellij.xdebugger.impl.actions.UseInlineDebuggerAction"/>
      <separator/>
      <reference ref="XDebugger.ToggleSortValues"/>
@@ -178,7 +178,7 @@
      <reference ref="ShelvedChanges.ShowHideDeleted" />
      <reference ref="ShelvedChanges.CleanMarkedToDelete"/>
     <action id="ShelfChanges.Settings" class="com.intellij.openapi.vcs.changes.shelf.OpenShelfSettings"
-              text="Shelf Settings" description="Open shelf settings" icon="AllIcons.General.SecondaryGroup"/>
+              text="Shelf Settings" description="Open shelf settings" icon="AllIcons.General.GearPlain"/>
    </group>

    <!--a group for plugins to add their actions-->
@@ -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));
@@ -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) {
@@ -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
@@ -452,7 +452,7 @@
    <action id="Maven.ShowSettings"
            class="org.jetbrains.idea.maven.project.actions.EditSettingsAction" text="Maven Settings"
            description="Edit Maven integration settings for the current project"
-            icon="AllIcons.General.ProjectSettings">
+            icon="AllIcons.General.GearPlain">
    </action>

    <action id="Maven.ToggleOffline"
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 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.lang.properties.editor;

 import com.intellij.icons.AllIcons;
@@ -52,7 +38,7 @@ public class PropertiesGroupingStructureViewComponent extends StructureViewCompo
  private ActionGroup createSettingsActionGroup() {
    DefaultActionGroup actionGroup = new DefaultActionGroup(PropertiesBundle.message("resource.bundle.editor.settings.action.title"), true);
    final Presentation presentation = actionGroup.getTemplatePresentation();
-    presentation.setIcon(AllIcons.General.ProjectSettings);
+    presentation.setIcon(AllIcons.General.GearPlain);
    actionGroup.add(new ResourceBundleEditorKeepEmptyValueToggleAction());

    actionGroup.add(new ToggleAction(PropertiesBundle.message("show.only.incomplete.action.text"), null, AllIcons.General.Error) {
@@ -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.jetbrains.python.console;

 import com.google.common.collect.Lists;
@@ -219,7 +205,7 @@ public class PydevConsoleRunnerImpl implements PydevConsoleRunner {
    toolbarActions.add(new ConnectDebuggerAction());

    DefaultActionGroup settings = new DefaultActionGroup("Settings", true);
-    settings.getTemplatePresentation().setIcon(AllIcons.General.SecondaryGroup);
+    settings.getTemplatePresentation().setIcon(AllIcons.General.GearPlain);
    settings.add(new PyVariableViewSettings.SimplifiedView(null));
    settings.add(new PyVariableViewSettings.AsyncView());