From de6256620b8150fc6700e3b2b30efeecfa54ceed Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Tue, 16 Oct 2012 10:35:01 +0200 Subject: [PATCH] Platform: icons consolidated: Refresh, Settings, ProjectSettings --- .../compiler/impl/CompilerPropertiesAction.java | 2 +- .../src/com/intellij/slicer/SlicePanel.java | 2 +- .../src/com/intellij/util/PlatformIcons.java | 4 ++-- platform/icons/src/actions/refresh.png | Bin 576 -> 709 bytes platform/icons/src/actions/showSettings.png | Bin 631 -> 0 bytes platform/icons/src/actions/sync.png | Bin 709 -> 0 bytes .../icons/src/general/applicationSettings.png | Bin 358 -> 0 bytes .../general/{ideOptions.png => settings.png} | Bin platform/icons/src/vcs/customizeView.png | Bin 517 -> 0 bytes platform/icons/src/vcs/refresh.png | Bin 709 -> 0 bytes .../actions/CodeInspectionAction.java | 2 +- .../ex/EditInspectionToolsSettingsAction.java | 2 +- .../ui/InspectionResultsView.java | 2 +- .../execution/impl/RunConfigurable.java | 4 ++-- .../intellij/find/actions/ShowUsagesAction.java | 2 +- .../ide/hierarchy/HierarchyBrowserBaseEx.java | 2 +- .../intellij/ide/todo/SetTodoFilterAction.java | 2 +- .../ui/DependenciesPanel.java | 2 +- .../ui/InspectionToolsConfigurable.java | 2 +- .../codeInspection/ui/ProfilesComboBox.java | 2 +- .../com/intellij/ui/SimpleColoredComponent.java | 8 ++++++-- .../src/com/intellij/util/ui/StatusText.java | 2 +- .../intellij/ide/plugins/PluginManagerMain.java | 2 +- .../internal/inspector/UiInspectorAction.java | 2 +- .../notification/EventLogToolWindowFactory.java | 2 +- .../impl/http/RefreshRemoteFileAction.java | 2 +- .../platform-resources/src/idea/LangActions.xml | 2 +- .../src/idea/PlatformActions.xml | 6 +++--- .../platform-resources/src/idea/VcsActions.xml | 4 ++-- .../com/intellij/usages/impl/UsageViewImpl.java | 7 +++++-- .../util/src/com/intellij/icons/AllIcons.java | 8 ++------ .../com/intellij/openapi/util/IconLoader.java | 8 ++++++++ .../ChangelistConflictNotificationPanel.java | 2 +- .../patch/ApplyPatchDifferentiatedDialog.java | 2 +- .../changes/ui/MultipleChangeListBrowser.java | 2 +- .../vcs/history/FileHistoryPanelImpl.java | 2 +- .../ig/telemetry/UpdateTelemetryViewAction.java | 2 +- .../android/resources/icons/AndroidIcons.java | 2 -- .../android/resources/icons/refreshPreview.png | Bin 358 -> 0 bytes .../android/resources/icons/restartLogcat.png | Bin 358 -> 0 bytes .../logcat/AndroidLogcatToolWindowView.java | 4 ++-- .../AndroidLayoutPreviewToolWindowForm.java | 3 ++- .../git4idea/history/wholeTree/GitLogUI.java | 2 +- .../git4idea/push/GitManualPushToBranch.java | 4 ++-- plugins/gradle/src/META-INF/plugin.xml | 2 +- .../groovy/resources/icons/JetgroovyIcons.java | 1 - plugins/groovy/resources/icons/mvc/refresh.png | Bin 365 -> 0 bytes .../griffon/UpdateGriffonSettingsAction.java | 4 ++-- .../maven/navigator/MavenProjectsNavigator.java | 3 ++- .../src/main/resources/META-INF/plugin.xml | 6 +++--- .../idea/svn/dialogs/PropertiesComponent.java | 2 +- .../svn/dialogs/RepositoryBrowserDialog.java | 4 ++-- .../idea/svn/history/RootsAndBranches.java | 2 +- .../tasks/actions/ConfigureServersAction.java | 2 +- 54 files changed, 72 insertions(+), 62 deletions(-) delete mode 100644 platform/icons/src/actions/showSettings.png delete mode 100644 platform/icons/src/actions/sync.png delete mode 100644 platform/icons/src/general/applicationSettings.png rename platform/icons/src/general/{ideOptions.png => settings.png} (100%) delete mode 100644 platform/icons/src/vcs/customizeView.png delete mode 100644 platform/icons/src/vcs/refresh.png delete mode 100644 plugins/android/resources/icons/refreshPreview.png delete mode 100644 plugins/android/resources/icons/restartLogcat.png delete mode 100644 plugins/groovy/resources/icons/mvc/refresh.png diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java index 9024c0e6ddc4..5f1bf292cdd1 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java @@ -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) { diff --git a/java/java-impl/src/com/intellij/slicer/SlicePanel.java b/java/java-impl/src/com/intellij/slicer/SlicePanel.java index 29c97144e5cf..64e741d3bfab 100644 --- a/java/java-impl/src/com/intellij/slicer/SlicePanel.java +++ b/java/java-impl/src/com/intellij/slicer/SlicePanel.java @@ -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); } diff --git a/platform/core-api/src/com/intellij/util/PlatformIcons.java b/platform/core-api/src/com/intellij/util/PlatformIcons.java index af73f0a41e2d..e068cf66c207 100644 --- a/platform/core-api/src/com/intellij/util/PlatformIcons.java +++ b/platform/core-api/src/com/intellij/util/PlatformIcons.java @@ -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; diff --git a/platform/icons/src/actions/refresh.png b/platform/icons/src/actions/refresh.png index 66a23da6f741c5639a3993692ff1f0b6058e046b..d842736514bd771f69c7969e55e5fca71a22f30b 100644 GIT binary patch delta 649 zcmV;40(Skt1jPlANPhxnNkl_8FP+A%T3PQjKDp&;%qM#I8>7U@in+Fe~hhiSP*`1kn zvLQ#+b;ql`t^(=J1Yfu`9Ms9U;WA=S zqcbb12w)ic5dk3B{OdgJY^vu=LbbM-KX-7VkV&q)9=nUN0WsD`B7mwY313DjmEE76 zfKtU>dVDE0(cEvAoaaF!XgUH22!6>_>m}@Ny_}kQb${pW`0?phTe;%=@Hq!6Qo196 z=kxWjQ4nUD2a}U8@2N-~|Gy-@%a;;Mk^e+0R2?r*O?+0DH;WHh}ARGnn9BtZA|p z5QxUuhCV6VcVc2d2(H^7Rm;vu+a&HAdopXq&D%gx01v{Ei>5FHnB=!X@v3|uh1HuU j)>_MgTYb*|1Q-B}ocg(Cp$A|90000mzrb&dpVcNu!7# z%rJB2oNvBw&LFKd)IwXnXN*ufi~tf!sdXX5i{0mIJLNeTE`I=`R?dk=XS_rr;?~zc zuwC!R-PhfN!P%Y3d#GjVehyuv;1r#o2M35n-wVd+(Z7A^9~=%LjJpZJ!&L;Sx4oJW za<ffO=FZpOE%Z7l^P?5GGBV+d+#(2DTdsi%kOe**kOV$kxCo-MaXY5ZhWN zo^AXgkVQWv$bV!qkW41SqFW~9*rl}+0@$Ja-uJUzH@{4wNIcr(#BKnlMxhZdB&$~7 za|Xb}u;c=K<}Z9`*pRv?QcCluLi&JFXtA6?7YYS#RM?FB;2hW=jrMGjqZ znD_Y6uP&6$W}#LaOJt3Eb(`P%XVzBJv%eeuc;gC5MtfX~f{PdCV=LoL6Rj>(7M->| znEHwxGCw_?4#<0%2J|j!F#rGn07*qoM6N<$ Eg1xKr?EnA( diff --git a/platform/icons/src/actions/showSettings.png b/platform/icons/src/actions/showSettings.png deleted file mode 100644 index bef176a3c0c73434523edc8cfa5e975f63f9e097..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 631 zcmV--0*L*IP)+RgCp}tvUm%8*shO(8o2$fnV=SPx)i6e6d}S>4*=K~J(d@V?I!|i$`~CX-{=lqh z&ENmq>+*%7(2JnHjdVEF>GS39_08k;&E)sb<@S@R&fDws;O+EgiqUR#aBy~VJWy)- z{r>;||I+65(&zQm=k$)Dv@%CyU`!m>>GRm?^V#b2+UfGz>hf@n!g7b8a*CmJlE&ff z^x^RP;_da~?)BsC`mC5iNnd>7?DSl3hUM_}$Km*XXffvU`snld>h$?waff7ntoHi;Wq+(W zPioNT_0i_^OQk{G0000TbW%=J08UO*afpbqxyH=Q)YjJ7+1c9K=IZL|>iYct{wBlh zo&W#<#Ysd#RCr!x%0+j=Kp2JLq!2ntnBdY*Jh;2NSKZy^|L@^TbJ_*(?mp*I>sg(v zSoR+R62x!*K~S0{4sv|ulwlD1g~ZXM$43@hcC+y~o@e7f$#T=PS_oiIi+`scWdJk4 zht|EWrKhEnPq*8~0QB4Si`y?XpBZ_*I&`k8hvI$lY1?NpQ2?(m&!Sq05kfc`K)%@* z&+-ps2P*>B;cYy4&)ks~<~z_bAfnJ5}#*h}9S9!sz; RdC&j=002ovPDHLkV1m=UUS$9P diff --git a/platform/icons/src/actions/sync.png b/platform/icons/src/actions/sync.png deleted file mode 100644 index d842736514bd771f69c7969e55e5fca71a22f30b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 709 zcmV;$0y_PPP)$0}4XG2P#+v52BzHTj`(R z!J7vUqK9H0yV;$Yb+RE#5|3RN*!lftKEKEJH!uhSu$2#W8U|)p(i&2S#+b;ql`t^(=J1Yfu`9Ms z9U;WA; zTdcTVp9q4QrlaAbGb^bGU>N!l0U+4?>pbmjs^?2WwYHc)cW|PRNv^vdyNj^_G1f;S zfT}79Uq&gF-JhL+QpH_*d?_{2+;5hg=RqTAIsym?e#unpCG2j!oSJ%d=k56M=~i30 z;{5PA2P#s!BY@}g^{`P8W|{|+lP~Y7NFD#bB)-d+5=)W)L@HDrFHcQ;R@1fIf!vGF z5W*f8|pB<74 z;M1%)or7YQBDAVW0Ewo zh+od)=(_zrSqma-b|<=V0%d_}yff!TRPCrslm)5;DX2dXp4T2z(wkS3Ur<)~^=A5; z9a?E!7Z0q-Y@2&z>EZutW;llAFRqxdyJ7l)*NxmufDVu?3GxeOP|?#j_3-lxF6`KO z=FF8VH*em&b?d>iuV24@|MSOl&R=t&!e&nw$B>G+(%#!bO$IzJ%39lavz#&ycyq=5 z|1Z4sgM;kxTI=+(vWN9^oX^}maqrOf47U?jW}Le_oUGp0J{8;deQn2%p8M(9KF79a zC+Mli^(XFgTe~DWM4fRT7ti diff --git a/platform/icons/src/general/ideOptions.png b/platform/icons/src/general/settings.png similarity index 100% rename from platform/icons/src/general/ideOptions.png rename to platform/icons/src/general/settings.png diff --git a/platform/icons/src/vcs/customizeView.png b/platform/icons/src/vcs/customizeView.png deleted file mode 100644 index 003d6d06b2d932fa822ea3b58117daaf7f4c60f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 517 zcmV+g0{Z=lP)^gG3GB9R#GSKMLU%6b1#<-z( z2lA8frPCvxiI;JV`m}6ev!q1DCPhZuo;0&wz8m9NS?phUKZml#|{PBk6QHKnw5! zXv@1q;nbLrocLn!U3Y@mo{Mg)T zu&Ex&bfd{{%}oaMJQdq*reJ@Wz`wX9&@OO`b*_`arvL*0cO=%#S{v)|00000NkvXX Hu0mjfUKQxW diff --git a/platform/icons/src/vcs/refresh.png b/platform/icons/src/vcs/refresh.png deleted file mode 100644 index d842736514bd771f69c7969e55e5fca71a22f30b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 709 zcmV;$0y_PPP)$0}4XG2P#+v52BzHTj`(R z!J7vUqK9H0yV;$Yb+RE#5|3RN*!lftKEKEJH!uhSu$2#W8U|)p(i&2S#+b;ql`t^(=J1Yfu`9Ms z9U;WA; zTdcTVp9q4QrlaAbGb^bGU>N!l0U+4?>pbmjs^?2WwYHc)cW|PRNv^vdyNj^_G1f;S zfT}79Uq&gF-JhL+QpH_*d?_{2+;5hg=RqTAIsym?e#unpCG2j!oSJ%d=k56M=~i30 z;{5PA2P#s!BY@}g^{`P8W|{|+lP~Y7NFD#bB)-d+5=)W)L@HDrFHcQ;R@1fIf!vGF z5W*f8|pB<74 z 0) { builder.append("').append(StringUtil.escapeXml(fragment)).append(""); + builder.append('>').append(convertFragment(fragment)).append(""); } } @@ -468,10 +468,14 @@ public class SimpleColoredComponent extends JComponent implements Accessible { if (fragment.length() > 0) { builder.append("').append(StringUtil.escapeXml(fragment)).append(""); + builder.append('>').append(convertFragment(fragment)).append(""); } } + private static String convertFragment(String fragment) { + return StringUtil.escapeXml(fragment).replaceAll("\\\\n", "
"); + } + private static void formatStyle(final StringBuilder builder, final SimpleTextAttributes attributes) { final Color fgColor = attributes.getFgColor(); final Color bgColor = attributes.getBgColor(); diff --git a/platform/platform-api/src/com/intellij/util/ui/StatusText.java b/platform/platform-api/src/com/intellij/util/ui/StatusText.java index 7893f72c9c57..8b19e77c198d 100644 --- a/platform/platform-api/src/com/intellij/util/ui/StatusText.java +++ b/platform/platform-api/src/com/intellij/util/ui/StatusText.java @@ -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); } diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java index 92069f917f3c..6fda64964eb3 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java @@ -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 diff --git a/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java b/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java index 2123be99e46e..3af9d5b30401 100644 --- a/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java +++ b/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java @@ -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(); } diff --git a/platform/platform-impl/src/com/intellij/notification/EventLogToolWindowFactory.java b/platform/platform-impl/src/com/intellij/notification/EventLogToolWindowFactory.java index 2bfa794a0c2d..90609d07da5d 100644 --- a/platform/platform-impl/src/com/intellij/notification/EventLogToolWindowFactory.java +++ b/platform/platform-impl/src/com/intellij/notification/EventLogToolWindowFactory.java @@ -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; } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RefreshRemoteFileAction.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RefreshRemoteFileAction.java index 0354d25b5477..02108dd66999 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RefreshRemoteFileAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RefreshRemoteFileAction.java @@ -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; } diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml index 30442630f978..61afd9523fde 100644 --- a/platform/platform-resources/src/idea/LangActions.xml +++ b/platform/platform-resources/src/idea/LangActions.xml @@ -427,7 +427,7 @@ - + diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml index d1cb91fecc37..0194b58651b6 100644 --- a/platform/platform-resources/src/idea/PlatformActions.xml +++ b/platform/platform-resources/src/idea/PlatformActions.xml @@ -144,7 +144,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -488,7 +488,7 @@ icon="AllIcons.Actions.Delete"/> + icon="AllIcons.Actions.Refresh"/> diff --git a/platform/platform-resources/src/idea/VcsActions.xml b/platform/platform-resources/src/idea/VcsActions.xml index 187bcb86d9fb..a5e48bf85efb 100644 --- a/platform/platform-resources/src/idea/VcsActions.xml +++ b/platform/platform-resources/src/idea/VcsActions.xml @@ -74,7 +74,7 @@ + icon="AllIcons.Actions.Refresh"/> + icon="AllIcons.Actions.Refresh"/> 6Lr_ghJ626LWK%Vuav@SnHho?oZCxv;Y!<9` z8K!Ow){h$c<&O2vQS`JBq-_lMxf%E9q59S}^u;;$!yxd~XZOY=_vV}T=%DoBjrh(i z`P4J{+F|+Ncj>-N_QD_g*-9HM!l?iN02FjmPE!DTe2|cpnY6UGx5UKC(bd`V^7|vn zY%2f&0E0rgDPokEnY zkcI(y>H0`^HB0G?f>g1Xks(pO0%)F-^`OG#fOa6Lr_ghJ626LWK%Vuav@SnHho?oZCxv;Y!<9` z8K!Ow){h$c<&O2vQS`JBq-_lMxf%E9q59S}^u;;$!yxd~XZOY=_vV}T=%DoBjrh(i z`P4J{+F|+Ncj>-N_QD_g*-9HM!l?iN02FjmPE!DTe2|cpnY6UGx5UKC(bd`V^7|vn zY%2f&0E0rgDPokEnY zkcI(y>H0`^HB0G?f>g1Xks(pO0%)F-^`OG#fOa - + diff --git a/plugins/groovy/resources/icons/JetgroovyIcons.java b/plugins/groovy/resources/icons/JetgroovyIcons.java index 8d3d834ec354..83797926a772 100644 --- a/plugins/groovy/resources/icons/JetgroovyIcons.java +++ b/plugins/groovy/resources/icons/JetgroovyIcons.java @@ -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 } diff --git a/plugins/groovy/resources/icons/mvc/refresh.png b/plugins/groovy/resources/icons/mvc/refresh.png deleted file mode 100644 index 94c078976ca6e3a90f5995c408b12f035caf2da6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 365 zcmV-z0h0cSP)6Lr_ghJ626LWK%Vuav@SnHho?oZCxv;Y!<9` z8K!Ow){h$c<&NZ_4Ww-h<+nri&QbTd8TaU+CT z@yRau&Mf)VGx^$K`QUf@);09ujr-Y3p%*fX0000KbW%=J0DF9pkd>LVw70j!#LCgt z+4A!HBgt$l0001lNkl0bQL;en2jrw_1KE`!D2>+NVzhg+D?N5 + icon="AllIcons.Actions.Refresh"> + icon="AllIcons.Actions.Refresh"> + icon="AllIcons.General.ProjectSettings">