MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Platform: icons consolidated: Refresh, Settings, ProjectSettings

Browse Source
This commit is contained in:
Anton Makeev
2012-10-16 10:35:01 +02:00
parent 27cb382db8
commit de6256620b
54 changed files with 72 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java
+1 -1
View File
@@ -30,7 +30,7 @@ import com.intellij.openapi.project.Project;
*/
class CompilerPropertiesAction extends AnAction {
public CompilerPropertiesAction() {
super(CompilerBundle.message("action.compiler.properties.text"), null, AllIcons.General.IdeOptions);
super(CompilerBundle.message("action.compiler.properties.text"), null, AllIcons.General.Settings);
}
public void actionPerformed(AnActionEvent e) {
java/java-impl/src/com/intellij/slicer/SlicePanel.java
+1 -1
View File
@@ -379,7 +379,7 @@ public abstract class SlicePanel extends JPanel implements TypeSafeDataProvider,
private final class MyRefreshAction extends RefreshAction {
private MyRefreshAction(JComponent tree) {
super(IdeBundle.message("action.refresh"), IdeBundle.message("action.refresh"), AllIcons.Actions.Sync);
super(IdeBundle.message("action.refresh"), IdeBundle.message("action.refresh"), AllIcons.Actions.Refresh);
registerShortcutOn(tree);
}
platform/core-api/src/com/intellij/util/PlatformIcons.java
+2 -2
View File
@@ -82,8 +82,8 @@ public interface PlatformIcons {
Icon SELECT_ALL_ICON = AllIcons.Actions.Selectall;
Icon UNSELECT_ALL_ICON = AllIcons.Actions.Unselectall;
Icon PROPERTIES_ICON = AllIcons.Actions.Properties;
Icon SYNCHRONIZE_ICON = AllIcons.Actions.Sync;
Icon SHOW_SETTINGS_ICON = AllIcons.Actions.ShowSettings;
Icon SYNCHRONIZE_ICON = AllIcons.Actions.Refresh;
Icon SHOW_SETTINGS_ICON = AllIcons.General.Settings;
Icon CHECK_ICON = AllIcons.Actions.Checked;
Icon CHECK_ICON_SELECTED = AllIcons.Actions.Checked_selected;
platform/icons/src/actions/refresh.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 576 B

After

Width:  |  Height:  |  Size: 709 B

platform/icons/src/actions/showSettings.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 631 B

platform/icons/src/actions/sync.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 709 B

platform/icons/src/general/applicationSettings.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 358 B

platform/icons/src/general/ideOptions.png → platform/icons/src/general/settings.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 517 B

After

Width:  |  Height:  |  Size: 517 B

platform/icons/src/vcs/customizeView.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 517 B

platform/icons/src/vcs/refresh.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 709 B

platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class CodeInspectionAction extends BaseAnalysisAction {
if (value instanceof Profile) {
final Profile profile = (Profile)value;
setText(profile.getName());
setIcon(profile.isLocal() ? AllIcons.General.ApplicationSettings : AllIcons.General.ProjectSettings);
setIcon(profile.isLocal() ? AllIcons.General.Settings : AllIcons.General.ProjectSettings);
}
}
});
platform/lang-impl/src/com/intellij/codeInspection/ex/EditInspectionToolsSettingsAction.java
+1 -1
View File
@@ -113,6 +113,6 @@ public class EditInspectionToolsSettingsAction implements IntentionAction, Icona
}
public Icon getIcon(int flags) {
return AllIcons.General.IdeOptions;
return AllIcons.General.Settings;
}
}
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
+1 -1
View File
@@ -788,7 +788,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
private class EditSettingsAction extends AnAction {
private EditSettingsAction() {
super(InspectionsBundle.message("inspection.action.edit.settings"), InspectionsBundle.message("inspection.action.edit.settings"),
AllIcons.General.IdeOptions);
AllIcons.General.Settings);
}
public void actionPerformed(AnActionEvent e) {
platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
+2 -2
View File
@@ -151,7 +151,7 @@ class RunConfigurable extends BaseConfigurable {
}
else if (userObject instanceof String) {
append((String) userObject, SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES);
setIcon(AllIcons.General.IdeOptions);
setIcon(AllIcons.General.Settings);
}
else if (userObject instanceof ConfigurationFactory) {
append(((ConfigurationFactory)userObject).getName());
@@ -1265,7 +1265,7 @@ class RunConfigurable extends BaseConfigurable {
private class MyEditDefaultsAction extends AnAction {
public MyEditDefaultsAction() {
super(ExecutionBundle.message("run.configuration.edit.default.configuration.settings.button"),
"Edit default settings", AllIcons.General.IdeOptions);
"Edit default settings", AllIcons.General.Settings);
}
public void actionPerformed(final AnActionEvent e) {
platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
+1 -1
View File
@@ -498,7 +498,7 @@ public class ShowUsagesAction extends AnAction implements PopupAction {
if (shortcut != null) {
shortcutText = "(" + KeymapUtil.getShortcutText(shortcut) + ")";
}
return new InplaceButton("Options..." + shortcutText, AllIcons.General.IdeOptions, new ActionListener() {
return new InplaceButton("Options..." + shortcutText, AllIcons.General.Settings, new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
SwingUtilities.invokeLater(new Runnable() {
platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java
+1 -1
View File
@@ -610,7 +610,7 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem
protected class RefreshAction extends com.intellij.ide.actions.RefreshAction {
public RefreshAction() {
super(IdeBundle.message("action.refresh"), IdeBundle.message("action.refresh"), AllIcons.Actions.Sync);
super(IdeBundle.message("action.refresh"), IdeBundle.message("action.refresh"), AllIcons.Actions.Refresh);
}
public final void actionPerformed(final AnActionEvent e) {
platform/lang-impl/src/com/intellij/ide/todo/SetTodoFilterAction.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class SetTodoFilterAction extends AnAction implements CustomComponentActi
group.addSeparator();
group.add(
new AnAction(IdeBundle.message("action.todo.edit.filters"),
IdeBundle.message("action.todo.edit.filters"), AllIcons.General.IdeOptions) {
IdeBundle.message("action.todo.edit.filters"), AllIcons.General.Settings) {
public void actionPerformed(AnActionEvent e) {
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
util.editConfigurable(project, new TodoConfigurable());
platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java
+1 -1
View File
@@ -622,7 +622,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
private final class EditDependencyRulesAction extends AnAction {
public EditDependencyRulesAction() {
super(AnalysisScopeBundle.message("action.edit.rules"), AnalysisScopeBundle.message("action.edit.rules.description"),
AllIcons.General.IdeOptions);
AllIcons.General.Settings);
}
public void actionPerformed(AnActionEvent e) {
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java
+1 -1
View File
@@ -303,7 +303,7 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable imple
final String profileName = value.getName();
setText(profileName);
final SingleInspectionProfilePanel panel = getProfilePanel(value);
setIcon(panel != null && panel.isProfileShared() ? AllIcons.General.ProjectSettings : AllIcons.General.ApplicationSettings);
setIcon(panel != null && panel.isProfileShared() ? AllIcons.General.ProjectSettings : AllIcons.General.Settings);
}
});
myProfiles.addActionListener(new ActionListener() {
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ProfilesComboBox.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class ProfilesComboBox extends JComboBox {
if (value instanceof Profile) {
final Profile profile = (Profile)value;
setText(profile.getName());
setIcon(profile.isLocal() ? AllIcons.General.ApplicationSettings : AllIcons.General.ProjectSettings);
setIcon(profile.isLocal() ? AllIcons.General.Settings : AllIcons.General.ProjectSettings);
}
else if (value instanceof String) {
setText((String)value);
platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java
+6 -2
View File
@@ -460,7 +460,7 @@ public class SimpleColoredComponent extends JComponent implements Accessible {
if (fragment.length() > 0) {
builder.append("<span");
formatStyle(builder, attributes);
builder.append('>').append(StringUtil.escapeXml(fragment)).append("</span>");
builder.append('>').append(convertFragment(fragment)).append("</span>");
}
}
@@ -468,10 +468,14 @@ public class SimpleColoredComponent extends JComponent implements Accessible {
if (fragment.length() > 0) {
builder.append("<a href=\"").append(StringUtil.replace(url, "\"", "%22")).append("\"");
formatStyle(builder, attributes);
builder.append('>').append(StringUtil.escapeXml(fragment)).append("</a>");
builder.append('>').append(convertFragment(fragment)).append("</a>");
}
}
private static String convertFragment(String fragment) {
return StringUtil.escapeXml(fragment).replaceAll("\\\\n", "<br>");
}
private static void formatStyle(final StringBuilder builder, final SimpleTextAttributes attributes) {
final Color fgColor = attributes.getFgColor();
final Color bgColor = attributes.getBgColor();
platform/platform-api/src/com/intellij/util/ui/StatusText.java
+1 -1
View File
@@ -124,7 +124,7 @@ public abstract class StatusText {
Dimension size = myComponent.getPreferredSize();
int x = (ownerRec.width - size.width) / 2;
int y = (ownerRec.height - size.height) / 2;
int y = (ownerRec.height - size.height) / 3;
return new Rectangle(x, y, size.width, size.height);
}
platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java
+1 -1
View File
@@ -549,7 +549,7 @@ public abstract class PluginManagerMain implements Disposable {
protected class RefreshAction extends DumbAwareAction {
public RefreshAction() {
super("Reload List of Plugins", "Reload list of plugins", AllIcons.Actions.Sync);
super("Reload List of Plugins", "Reload list of plugins", AllIcons.Actions.Refresh);
}
@Override
platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java
+1 -1
View File
@@ -132,7 +132,7 @@ public class UiInspectorAction extends ToggleAction implements DumbAware {
bar.addSeparator();
bar.add(new AbstractAction("Refresh", AllIcons.Actions.Sync) {
bar.add(new AbstractAction("Refresh", AllIcons.Actions.Refresh) {
public void actionPerformed(ActionEvent e) {
getCurrentTable().refresh();
}
platform/platform-impl/src/com/intellij/notification/EventLogToolWindowFactory.java
+1 -1
View File
@@ -95,7 +95,7 @@ public class EventLogToolWindowFactory implements ToolWindowFactory, DumbAware {
private final Project myProject;
public EditNotificationSettings(Project project) {
super("Settings", "Edit notification settings", AllIcons.Actions.ShowSettings);
super("Settings", "Edit notification settings", AllIcons.General.Settings);
myProject = project;
}
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RefreshRemoteFileAction.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class RefreshRemoteFileAction extends AnAction {
private final HttpVirtualFile myFile;
public RefreshRemoteFileAction(HttpVirtualFile file) {
super("Reload File", "", AllIcons.Actions.Sync);
super("Reload File", "", AllIcons.Actions.Refresh);
myFile = file;
}
platform/platform-resources/src/idea/LangActions.xml
+1 -1
View File
@@ -427,7 +427,7 @@
<reference ref="ProjectViewPopupMenuRunGroup"/>
<separator/>
<reference ref="VersionControlsGroup"/>
<action id="SynchronizeCurrentFile" class="com.intellij.ide.actions.SynchronizeCurrentFileAction" icon="AllIcons.Actions.Sync"/>
<action id="SynchronizeCurrentFile" class="com.intellij.ide.actions.SynchronizeCurrentFileAction" icon="AllIcons.Actions.Refresh"/>
<separator/>
<action id="RevealIn" class="com.intellij.ide.actions.RevealFileAction"/>
<reference ref="ShowFilePath"/>
platform/platform-resources/src/idea/PlatformActions.xml
+3 -3
View File
@@ -144,7 +144,7 @@
</group>
<separator/>
<group id="FileMainSettingsGroup">
<action id="ShowSettings" class="com.intellij.ide.actions.ShowSettingsAction" icon="AllIcons.General.IdeOptions"/>
<action id="ShowSettings" class="com.intellij.ide.actions.ShowSettingsAction" icon="AllIcons.General.Settings"/>
<group id="FileOtherSettingsGroup" class="com.intellij.ide.actions.SmartPopupActionGroup">
<action id="TemplateProjectProperties" class="com.intellij.ide.actions.TemplateProjectPropertiesAction"/>
<group id="FileSettingsGroup"/>
@@ -157,7 +157,7 @@
<action id="ImportSettings" class="com.intellij.ide.actions.ImportSettingsAction"/>
</group>
<separator/>
<action id="Synchronize" class="com.intellij.ide.actions.SynchronizeAction" icon="AllIcons.Actions.Sync"/>
<action id="Synchronize" class="com.intellij.ide.actions.SynchronizeAction" icon="AllIcons.Actions.Refresh"/>
<action id="InvalidateCaches" class="com.intellij.ide.actions.InvalidateCachesAction"/>
<group id="ChangeFileEncodingGroup" popup="true" class="com.intellij.openapi.vfs.encoding.ChangeEncodingUpdateGroup">
@@ -488,7 +488,7 @@
icon="AllIcons.Actions.Delete"/>
<separator/>
<action id="FileChooser.Refresh" class="com.intellij.openapi.fileChooser.actions.RefreshFileChooserAction"
icon="AllIcons.Actions.Sync"/>
icon="AllIcons.Actions.Refresh"/>
<separator/>
<action id="FileChooser.ShowHiddens" class="com.intellij.openapi.fileChooser.actions.ShowHiddensAction"
icon="AllIcons.Actions.ShowHiddens"/>
platform/platform-resources/src/idea/VcsActions.xml
+2 -2
View File
@@ -74,7 +74,7 @@
<group id="ChangesViewToolbar">
<action id="ChangesView.Refresh" class="com.intellij.openapi.vcs.changes.actions.RefreshAction"
icon="AllIcons.Actions.Sync"/>
icon="AllIcons.Actions.Refresh"/>
<action id="ChangesView.Commit" class="com.intellij.openapi.vcs.actions.CommonCheckinProjectAction"
icon="AllIcons.Actions.Commit"/>
<action id="ChangesView.Rollback" class="com.intellij.openapi.vcs.changes.actions.RollbackAction"
@@ -146,7 +146,7 @@
<group id="CommittedChangesToolbar">
<action id="CommittedChanges.Refresh" class="com.intellij.openapi.vcs.changes.committed.RefreshCommittedAction"
icon="AllIcons.Actions.Sync"/>
icon="AllIcons.Actions.Refresh"/>
<action id="CommittedChanges.Filter" class="com.intellij.openapi.vcs.changes.committed.FilterCommittedAction"
icon="AllIcons.Ant.Filter"/>
<action id="CommittedChanges.Details" class="com.intellij.openapi.vcs.changes.committed.ChangeListDetailsAction"
platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
+5 -2
View File
@@ -47,7 +47,10 @@ import com.intellij.usageView.UsageViewBundle;
import com.intellij.usageView.UsageViewManager;
import com.intellij.usages.*;
import com.intellij.usages.rules.*;
import com.intellij.util.*;
import com.intellij.util.Alarm;
import com.intellij.util.Consumer;
import com.intellij.util.EditSourceOnDoubleClickHandler;
import com.intellij.util.Processor;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.TransferToEDTQueue;
import com.intellij.util.messages.MessageBusConnection;
@@ -485,7 +488,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
}
private AnAction showSettings() {
return new AnAction("Options...", "show find usages settings dialog", PlatformIcons.SHOW_SETTINGS_ICON) {
return new AnAction("Options...", "show find usages settings dialog", AllIcons.General.ProjectSettings) {
{
KeyboardShortcut shortcut = getShowUsagesWithSettingsShortcut();
if (shortcut != null) {
platform/util/src/com/intellij/icons/AllIcons.java
+2 -6
View File
@@ -65,6 +65,7 @@ public class AllIcons {
public static final Icon FileStatus = IconLoader.getIcon("/actions/fileStatus.png"); // 16x16
public static final Icon Filter_small = IconLoader.getIcon("/actions/filter_small.png"); // 16x16
public static final Icon Find = IconLoader.getIcon("/actions/find.png"); // 16x16
public static final Icon ForceRefresh = IconLoader.getIcon("/actions/forceRefresh.png"); // 16x16
public static final Icon Forward = IconLoader.getIcon("/actions/forward.png"); // 16x16
public static final Icon GC = IconLoader.getIcon("/actions/gc.png"); // 16x16
public static final Icon Get = IconLoader.getIcon("/actions/get.png"); // 16x16
@@ -122,7 +123,6 @@ public class AllIcons {
public static final Icon ShowHiddens = IconLoader.getIcon("/actions/showHiddens.png"); // 16x16
public static final Icon ShowImportStatements = IconLoader.getIcon("/actions/showImportStatements.png"); // 16x16
public static final Icon ShowReadAccess = IconLoader.getIcon("/actions/showReadAccess.png"); // 16x16
public static final Icon ShowSettings = IconLoader.getIcon("/actions/showSettings.png"); // 16x16
public static final Icon ShowSource = IconLoader.getIcon("/actions/showSource.png"); // 16x16
public static final Icon ShowViewer = IconLoader.getIcon("/actions/showViewer.png"); // 16x16
public static final Icon ShowWriteAccess = IconLoader.getIcon("/actions/showWriteAccess.png"); // 16x16
@@ -135,7 +135,6 @@ public class AllIcons {
public static final Icon Submit1 = IconLoader.getIcon("/actions/submit1.png"); // 11x11
public static final Icon Suspend = IconLoader.getIcon("/actions/suspend.png"); // 16x16
public static final Icon SwapPanels = IconLoader.getIcon("/actions/swapPanels.png"); // 16x16
public static final Icon Sync = IconLoader.getIcon("/actions/sync.png"); // 16x16
public static final Icon SyncPanels = IconLoader.getIcon("/actions/syncPanels.png"); // 16x16
public static final Icon ToggleSoftWrap = IconLoader.getIcon("/actions/toggleSoftWrap.png"); // 16x16
public static final Icon TraceInto = IconLoader.getIcon("/actions/traceInto.png"); // 16x16
@@ -337,7 +336,6 @@ public class AllIcons {
public static final Icon Add = IconLoader.getIcon("/general/add.png"); // 16x16
public static final Icon AddFavoritesList = IconLoader.getIcon("/general/addFavoritesList.png"); // 16x16
public static final Icon AddJdk = IconLoader.getIcon("/general/addJdk.png"); // 16x16
public static final Icon ApplicationSettings = IconLoader.getIcon("/general/applicationSettings.png"); // 16x16
public static final Icon ArrowDown = IconLoader.getIcon("/general/arrowDown.png"); // 7x6
public static final Icon AutohideOff = IconLoader.getIcon("/general/autohideOff.png"); // 14x14
public static final Icon AutohideOffInactive = IconLoader.getIcon("/general/autohideOffInactive.png"); // 14x14
@@ -398,7 +396,6 @@ public class AllIcons {
public static final Icon HideRightPartHover = IconLoader.getIcon("/general/hideRightPartHover.png"); // 16x16
public static final Icon HideToolWindow = IconLoader.getIcon("/general/hideToolWindow.png"); // 14x14
public static final Icon HideToolWindowInactive = IconLoader.getIcon("/general/hideToolWindowInactive.png"); // 14x14
public static final Icon IdeOptions = IconLoader.getIcon("/general/ideOptions.png"); // 16x16
public static final Icon IjLogo = IconLoader.getIcon("/general/ijLogo.png"); // 16x16
public static final Icon ImplementingMethod = IconLoader.getIcon("/general/implementingMethod.png"); // 10x14
public static final Icon InformationDialog = IconLoader.getIcon("/general/informationDialog.png"); // 32x32
@@ -440,6 +437,7 @@ public class AllIcons {
public static final Icon RunWithCoverage = IconLoader.getIcon("/general/runWithCoverage.png"); // 16x16
public static final Icon SecondaryGroup = IconLoader.getIcon("/general/secondaryGroup.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
public static final Icon Show_to_override = IconLoader.getIcon("/general/show_to_override.png"); // 16x16
public static final Icon SmallConfigurableVcs = IconLoader.getIcon("/general/smallConfigurableVcs.png"); // 16x16
@@ -1052,14 +1050,12 @@ public class AllIcons {
public static final Icon Arrow_left = IconLoader.getIcon("/vcs/arrow_left.png"); // 12x12
public static final Icon Arrow_right = IconLoader.getIcon("/vcs/arrow_right.png"); // 12x12
public static final Icon CheckSpelling = IconLoader.getIcon("/vcs/checkSpelling.png"); // 16x16
public static final Icon CustomizeView = IconLoader.getIcon("/vcs/customizeView.png"); // 16x16
public static final Icon Equal = IconLoader.getIcon("/vcs/equal.png"); // 12x12
public static final Icon MapBase = IconLoader.getIcon("/vcs/mapBase.png"); // 16x16
public static final Icon Merge = IconLoader.getIcon("/vcs/merge.png"); // 12x12
public static final Icon MergeSourcesTree = IconLoader.getIcon("/vcs/mergeSourcesTree.png"); // 16x16
public static final Icon MessageHistory = IconLoader.getIcon("/vcs/messageHistory.png"); // 16x16
public static final Icon Not_equal = IconLoader.getIcon("/vcs/not_equal.png"); // 12x12
public static final Icon Refresh = IconLoader.getIcon("/vcs/refresh.png"); // 16x16
public static final Icon Remove = IconLoader.getIcon("/vcs/remove.png"); // 16x16
public static final Icon ResetStrip = IconLoader.getIcon("/vcs/resetStrip.png"); // 16x16
public static final Icon StripDown = IconLoader.getIcon("/vcs/stripDown.png"); // 16x16
platform/util/src/com/intellij/openapi/util/IconLoader.java
+8
View File
@@ -55,6 +55,14 @@ public final class IconLoader {
static {
ourDeprecatedIconsReplacements.put("/general/toolWindowDebugger.png", "AllIcons.Toolwindows.ToolWindowDebugger");
ourDeprecatedIconsReplacements.put("/general/toolWindowChanges.png", "AllIcons.Toolwindows.ToolWindowChanges");
ourDeprecatedIconsReplacements.put("/actions/showSettings.png", "AllIcons.General.ProjectSettings");
ourDeprecatedIconsReplacements.put("/general/ideOptions.png", "AllIcons.General.Settings");
ourDeprecatedIconsReplacements.put("/general/applicationSettings.png", "AllIcons.General.Settings");
ourDeprecatedIconsReplacements.put("/vcs/customizeView.png", "AllIcons.General.Settings");
ourDeprecatedIconsReplacements.put("/vcs/refresh.png", "AllIcons.Actions.Refresh");
ourDeprecatedIconsReplacements.put("/actions/sync.png", "AllIcons.Actions.Refresh");
}
private static final ImageIcon EMPTY_ICON = new ImageIcon(new BufferedImage(1, 1, BufferedImage.TYPE_3BYTE_BGR)) {
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictNotificationPanel.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class ChangelistConflictNotificationPanel extends EditorNotificationPanel
// setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 0));
myLinksPanel.add(new InplaceButton("Show options dialog", AllIcons.General.IdeOptions, new ActionListener() {
myLinksPanel.add(new InplaceButton("Show options dialog", AllIcons.General.Settings, new ActionListener() {
public void actionPerformed(ActionEvent e) {
ShowSettingsUtil.getInstance().editConfigurable(myTracker.getProject(),
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
+1 -1
View File
@@ -420,7 +420,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
group.add(new ResetStrip());
group.add(new ZeroStrip());
if (myCanChangePatchFile) {
group.add(new AnAction("Refresh", "Refresh", AllIcons.Actions.Sync) {
group.add(new AnAction("Refresh", "Refresh", AllIcons.Actions.Refresh) {
@Override
public void actionPerformed(AnActionEvent e) {
queueRequest();
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleChangeListBrowser.java
+1 -1
View File
@@ -322,7 +322,7 @@ public class MultipleChangeListBrowser extends ChangesBrowser {
}
public void addToolbarActions(final DialogWrapper dialogWrapper) {
final Icon icon = AllIcons.Actions.Sync;
final Icon icon = AllIcons.Actions.Refresh;
if (myBrowser.myChangesToDisplay == null) {
myBrowser.addToolbarAction(new AnAction("Refresh Changes") {
@Override
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+1 -1
View File
@@ -1663,7 +1663,7 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton {
private class RefreshFileHistoryAction extends AnAction implements DumbAware {
public RefreshFileHistoryAction() {
super(VcsBundle.message("action.name.refresh"), VcsBundle.message("action.desctiption.refresh"), AllIcons.Actions.Sync);
super(VcsBundle.message("action.name.refresh"), VcsBundle.message("action.desctiption.refresh"), AllIcons.Actions.Refresh);
}
public void actionPerformed(AnActionEvent e) {
plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/UpdateTelemetryViewAction.java
+1 -1
View File
@@ -31,7 +31,7 @@ class UpdateTelemetryViewAction extends AnAction {
super(CommonBundle.message("action.refresh"),
InspectionGadgetsBundle.message(
"action.telemetry.refresh.description"),
AllIcons.Actions.Sync);
AllIcons.Actions.Refresh);
this.telemetry = telemetry;
this.telemetryDisplay = telemetryDisplay;
}
plugins/android/resources/icons/AndroidIcons.java
-2
View File
@@ -18,8 +18,6 @@ public class AndroidIcons {
public static final Icon AndroidPreview = load("/icons/androidPreview.png"); // 16x16
public static final Icon AndroidToolWindow = load("/icons/androidToolWindow.png"); // 13x13
public static final Icon AttachDebugger = load("/icons/attachDebugger.png"); // 16x16
public static final Icon RefreshPreview = load("/icons/refreshPreview.png"); // 16x16
public static final Icon RestartLogcat = load("/icons/restartLogcat.png"); // 16x16
public static final Icon ZoomActual = load("/icons/zoomActual.png"); // 16x16
public static final Icon ZoomFit = load("/icons/zoomFit.png"); // 16x16
public static final Icon ZoomIn = load("/icons/zoomIn.png"); // 16x16
plugins/android/resources/icons/refreshPreview.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 358 B

plugins/android/resources/icons/restartLogcat.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 358 B

plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java
+2 -2
View File
@@ -22,6 +22,7 @@ import com.intellij.CommonBundle;
import com.intellij.diagnostic.logging.LogConsoleBase;
import com.intellij.diagnostic.logging.LogConsoleListener;
import com.intellij.facet.ProjectFacetManager;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.ApplicationManager;
@@ -38,7 +39,6 @@ import com.intellij.ui.CollectionListModel;
import com.intellij.ui.ListCellRendererWrapper;
import com.intellij.ui.components.JBList;
import com.intellij.util.IconUtil;
import icons.AndroidIcons;
import org.jetbrains.android.facet.AndroidFacet;
import org.jetbrains.android.sdk.AndroidPlatform;
import org.jetbrains.android.util.AndroidBundle;
@@ -457,7 +457,7 @@ public abstract class AndroidLogcatToolWindowView implements Disposable {
private class MyRestartAction extends AnAction {
public MyRestartAction() {
super(AndroidBundle.message("android.restart.logcat.action.text"), AndroidBundle.message("android.restart.logcat.action.description"),
AndroidIcons.RestartLogcat);
AllIcons.Actions.Restart);
}
@Override
plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowForm.java
+2 -1
View File
@@ -27,6 +27,7 @@ import com.android.resources.ScreenSize;
import com.android.resources.UiMode;
import com.android.sdklib.IAndroidTarget;
import com.android.sdklib.SdkConstants;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.ex.CheckboxAction;
@@ -1320,7 +1321,7 @@ class AndroidLayoutPreviewToolWindowForm implements Disposable {
private class MyRefreshAction extends AnAction {
MyRefreshAction() {
super(AndroidBundle.message("android.layout.preview.refresh.action.text"), null, AndroidIcons.RefreshPreview);
super(AndroidBundle.message("android.layout.preview.refresh.action.text"), null, AllIcons.Actions.Refresh);
}
@Override
plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
+1 -1
View File
@@ -1512,7 +1512,7 @@ public class GitLogUI implements Disposable {
private class MyRefreshAction extends DumbAwareAction {
private MyRefreshAction() {
super("Refresh", "Refresh", AllIcons.Actions.Sync);
super("Refresh", "Refresh", AllIcons.Actions.Refresh);
}
@Override
plugins/git4idea/src/git4idea/push/GitManualPushToBranch.java
+2 -2
View File
@@ -16,10 +16,10 @@
package git4idea.push;
import com.intellij.icons.AllIcons;
import com.intellij.ui.ListCellRendererWrapper;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.impl.ActionButton;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.ui.ListCellRendererWrapper;
import com.intellij.ui.components.JBLabel;
import com.intellij.util.ui.GridBag;
import com.intellij.util.ui.UIUtil;
@@ -238,7 +238,7 @@ class GitManualPushToBranch extends JPanel {
private abstract static class GitPushLogRefreshAction extends DumbAwareAction {
GitPushLogRefreshAction() {
super("Refresh commit list", "Refresh commit list", AllIcons.Actions.Sync);
super("Refresh commit list", "Refresh commit list", AllIcons.Actions.Refresh);
}
}
plugins/gradle/src/META-INF/plugin.xml
+1 -1
View File
@@ -111,7 +111,7 @@
<!-- Tool window toolbar actions -->
<action id="Gradle.LinkToProject" class="org.jetbrains.plugins.gradle.action.GradleLinkToProjectAction"/>
<action id="Gradle.RefreshProject" class="org.jetbrains.plugins.gradle.action.GradleRefreshProjectAction" icon="AllIcons.Actions.Sync"/>
<action id="Gradle.RefreshProject" class="org.jetbrains.plugins.gradle.action.GradleRefreshProjectAction" icon="AllIcons.Actions.Refresh"/>
<action id="Gradle.OpenScript" class="org.jetbrains.plugins.gradle.action.GradleOpenScriptAction" icon="GradleIcons.GradleNavigate"/>
<action id="Gradle.Help.ToolWindow" class="org.jetbrains.plugins.gradle.action.GradleToolWindowHelpAction" icon="AllIcons.Actions.Help"/>
<group id="Gradle.ChangeActionsToolbar">
plugins/groovy/resources/icons/JetgroovyIcons.java
-1
View File
@@ -52,7 +52,6 @@ public class JetgroovyIcons {
public static final Icon Domain_class = load("/icons/mvc/domain_class.png"); // 16x16
public static final Icon Groovy_mvc_plugin = load("/icons/mvc/groovy_mvc_plugin.png"); // 16x16
public static final Icon ModelsNode = load("/icons/mvc/modelsNode.png"); // 16x16
public static final Icon Refresh = load("/icons/mvc/refresh.png"); // 16x16
public static final Icon Service = load("/icons/mvc/service.png"); // 16x16
}
plugins/groovy/resources/icons/mvc/refresh.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 365 B

plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/UpdateGriffonSettingsAction.java
+2 -2
View File
@@ -14,9 +14,9 @@
*/
package org.jetbrains.plugins.groovy.griffon;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.module.Module;
import icons.JetgroovyIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.groovy.mvc.MvcActionBase;
import org.jetbrains.plugins.groovy.mvc.MvcFramework;
@@ -38,7 +38,7 @@ public class UpdateGriffonSettingsAction extends MvcActionBase {
@Override
protected void updateView(AnActionEvent event, @NotNull MvcFramework framework, @NotNull Module module) {
event.getPresentation().setIcon(JetgroovyIcons.Mvc.Refresh);
event.getPresentation().setIcon(AllIcons.Actions.Refresh);
}
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java
+2 -1
View File
@@ -61,7 +61,7 @@ public class MavenProjectsNavigator extends MavenSimpleProjectComponent implemen
public static final String TOOL_WINDOW_ID = "Maven Projects";
private static final URL ADD_ICON_URL = MavenProjectsNavigator.class.getResource("/general/add.png");
private static final URL SYNC_ICON_URL = MavenProjectsNavigator.class.getResource("/actions/sync.png");
private static final URL SYNC_ICON_URL = MavenProjectsNavigator.class.getResource("/actions/refresh.png");
private MavenProjectsNavigatorState myState = new MavenProjectsNavigatorState();
@@ -267,6 +267,7 @@ public class MavenProjectsNavigator extends MavenSimpleProjectComponent implemen
}
}
};
myTree.getEmptyText().clear();
myTree.getSelectionModel().setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION);
}
plugins/maven/src/main/resources/META-INF/plugin.xml
+3 -3
View File
@@ -167,12 +167,12 @@
<actions>
<action id="Maven.Reimport" class="org.jetbrains.idea.maven.project.actions.ReimportAction"
text="Reimport All Maven Projects"
icon="AllIcons.Actions.Sync">
icon="AllIcons.Actions.Refresh">
</action>
<action id="Maven.ReimportProject" class="org.jetbrains.idea.maven.project.actions.ReimportProjectAction"
text="Reimport" description="Reimport selected Maven projects"
icon="AllIcons.Actions.Sync">
icon="AllIcons.Actions.Refresh">
</action>
<action id="Maven.UpdateFolders" class="org.jetbrains.idea.maven.project.actions.UpdateFoldersAction"
@@ -270,7 +270,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.Actions.ShowSettings">
icon="AllIcons.General.ProjectSettings">
</action>
<action id="Maven.ToggleOffline"
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java
+1 -1
View File
@@ -241,7 +241,7 @@ public class PropertiesComponent extends JPanel {
public void update(AnActionEvent e) {
e.getPresentation().setText("Refresh");
e.getPresentation().setDescription("Reload properties");
e.getPresentation().setIcon(AllIcons.Actions.Sync);
e.getPresentation().setIcon(AllIcons.Actions.Refresh);
e.getPresentation().setEnabled(myFile != null);
}
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java
+2 -2
View File
@@ -364,14 +364,14 @@ public class RepositoryBrowserDialog extends DialogWrapper {
private final RepositoryBrowserComponent myBrowserComponent;
public RefreshAction(final RepositoryBrowserComponent browserComponent) {
super(SvnBundle.message("action.name.refresh"), SvnBundle.message("repository.browser.refresh.action"), AllIcons.Actions.Sync);
super(SvnBundle.message("action.name.refresh"), SvnBundle.message("repository.browser.refresh.action"), AllIcons.Actions.Refresh);
myBrowserComponent = browserComponent;
}
public void update(AnActionEvent e) {
e.getPresentation().setText(SvnBundle.message("action.name.refresh"));
e.getPresentation().setDescription(SvnBundle.message("repository.browser.refresh.action"));
e.getPresentation().setIcon(AllIcons.Actions.Sync);
e.getPresentation().setIcon(AllIcons.Actions.Refresh);
e.getPresentation().setEnabled(myBrowserComponent.getSelectedNode() != null);
}
plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
+1 -1
View File
@@ -441,7 +441,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator {
private class MyRefresh extends AnAction {
private MyRefresh() {
super(SvnBundle.message("committed.changes.action.merge.highlighting.refresh.text"),
SvnBundle.message("committed.changes.action.merge.highlighting.refresh.description"), AllIcons.Actions.Sync);
SvnBundle.message("committed.changes.action.merge.highlighting.refresh.description"), AllIcons.Actions.Refresh);
}
@Override
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ConfigureServersAction.java
+1 -1
View File
@@ -12,7 +12,7 @@ import com.intellij.tasks.config.TaskRepositoriesConfigurable;
public class ConfigureServersAction extends BaseTaskAction {
public ConfigureServersAction() {
super("Configure Servers...", null, AllIcons.General.IdeOptions);
super("Configure Servers...", null, AllIcons.General.Settings);
}
@Override