From b71edf485189a2efed5c939d649888d8a9603c0e Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 27 Mar 2012 14:24:28 +0200 Subject: [PATCH] mac/win icons in IconUtil --- .../src/com/intellij/util/IconUtil.java | 20 +++++++++--------- platform/icons/src/toolbarDecorator/add.png | Bin 0 -> 610 bytes platform/icons/src/toolbarDecorator/edit.png | Bin 0 -> 435 bytes .../icons/src/toolbarDecorator/mac/add.png | Bin 0 -> 211 bytes .../icons/src/toolbarDecorator/mac/edit.png | Bin 0 -> 236 bytes .../src/toolbarDecorator/mac/moveDown.png | Bin 0 -> 194 bytes .../icons/src/toolbarDecorator/mac/moveUp.png | Bin 0 -> 187 bytes .../icons/src/toolbarDecorator/mac/remove.png | Bin 0 -> 171 bytes .../icons/src/toolbarDecorator/moveDown.png | Bin 0 -> 568 bytes .../icons/src/toolbarDecorator/moveUp.png | Bin 0 -> 517 bytes .../icons/src/toolbarDecorator/remove.png | Bin 0 -> 585 bytes .../FavoritesTreeViewPanel.java | 4 ++-- .../com/intellij/ui/CommonActionsPanel.java | 10 ++++----- .../util/ui/ValidatingTableEditor.java | 4 ++-- .../logcat/AndroidLogcatToolWindowView.java | 6 +++--- .../LayoutDeviceConfigurationsDialog.java | 19 +++++++++++++++-- 16 files changed, 39 insertions(+), 24 deletions(-) create mode 100644 platform/icons/src/toolbarDecorator/add.png create mode 100644 platform/icons/src/toolbarDecorator/edit.png create mode 100644 platform/icons/src/toolbarDecorator/mac/add.png create mode 100644 platform/icons/src/toolbarDecorator/mac/edit.png create mode 100644 platform/icons/src/toolbarDecorator/mac/moveDown.png create mode 100644 platform/icons/src/toolbarDecorator/mac/moveUp.png create mode 100644 platform/icons/src/toolbarDecorator/mac/remove.png create mode 100644 platform/icons/src/toolbarDecorator/moveDown.png create mode 100644 platform/icons/src/toolbarDecorator/moveUp.png create mode 100644 platform/icons/src/toolbarDecorator/remove.png diff --git a/platform/core-api/src/com/intellij/util/IconUtil.java b/platform/core-api/src/com/intellij/util/IconUtil.java index 564f9f019844..95cccedcc9e8 100644 --- a/platform/core-api/src/com/intellij/util/IconUtil.java +++ b/platform/core-api/src/com/intellij/util/IconUtil.java @@ -187,24 +187,24 @@ public class IconUtil { } } - public static Icon getAddRowIcon() { - return SystemInfo.isMac ? PlatformIcons.TABLE_ADD_ROW : PlatformIcons.ADD_ICON; + public static Icon getAddIcon() { + return getToolbarDecoratorIcon("add.png"); } - public static Icon getRemoveRowIcon() { - return SystemInfo.isMac ? PlatformIcons.TABLE_REMOVE_ROW : PlatformIcons.DELETE_ICON; + public static Icon getRemoveIcon() { + return getToolbarDecoratorIcon("remove.png"); } - public static Icon getMoveRowUpIcon() { - return SystemInfo.isMac ? PlatformIcons.TABLE_MOVE_ROW_UP : PlatformIcons.MOVE_UP_ICON; + public static Icon getMoveUpIcon() { + return getToolbarDecoratorIcon("moveUp.png"); } - public static Icon getMoveRowDownIcon() { - return SystemInfo.isMac ? PlatformIcons.TABLE_MOVE_ROW_DOWN : PlatformIcons.MOVE_DOWN_ICON; + public static Icon getMoveDownIcon() { + return getToolbarDecoratorIcon("moveDown.png"); } public static Icon getEditIcon() { - return SystemInfo.isMac ? PlatformIcons.TABLE_EDIT_ROW : PlatformIcons.EDIT; + return getToolbarDecoratorIcon("edit.png"); } public static Icon getAddClassIcon() { @@ -216,6 +216,6 @@ public class IconUtil { } private static String getToolbarDecoratorIconsFolder() { - return "/toolbarDecorator/" + (SystemInfo.isMac ? "" : "mac/"); + return "/toolbarDecorator/" + (SystemInfo.isMac ? "mac/" : ""); } } diff --git a/platform/icons/src/toolbarDecorator/add.png b/platform/icons/src/toolbarDecorator/add.png new file mode 100644 index 0000000000000000000000000000000000000000..9f1233e6e6c3fe6f4cc934d972fb0cc3c6c1e6c2 GIT binary patch literal 610 zcmV-o0-gPdP)?2|NX`A|Nk!rhQC1e|35&nzhH4mlc*!E zPWHASJpcg&*7*P7VVm&CI0gn@DF%iguNfG=KWAWIddtA@{s~ayZw7{cUm5;>e#WqH z%M2R^Cws7s00G1V)(C_QT*3?tzdr&szGC?I<0V5(TpI&}v=;;8zb_1o|GzOXvM@9J z`}YU#RDb{i+Xxc)|Kkk<;~${LpU)Zo|9Xq?%->H8|A0>Z^Wz)X$uIyAKwymwK=(8J zc+T+e*GHhHcMN}jeSs_Z{o@P6-#`C>8hPKLTxJWO~mKo6&_5axozh zaQ2clD;WN5OM~+P0tl}0|Hs!1izdb}{QvWb;qT9n3`tc7!HPd0s{{t_ABNXk(|}G! zI29m(Ab$K0bi$u63{1=*&jUm7-w(Kg|3AMl{Q3Et;n&yCK#lBhaex4VgzA5wNx+a} z`1=Lu-S0sB3$EZN&~G43KfeJ3=?@~Y00a=ksX!fBnSp{nJOFjY4pZ009Kn$fXm0WXrL6Hvj(p14qrjfB%7|gV;h4`mZ1m w|6|Y#E<6I$2oOMwPxbH=IsgCw07*qoM6N<$g7#z$k^lez literal 0 HcmV?d00001 diff --git a/platform/icons/src/toolbarDecorator/edit.png b/platform/icons/src/toolbarDecorator/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..c68452ab50fc51a2a8a431fdd811b7e87a74b20d GIT binary patch literal 435 zcmV;k0ZjghP)NpQNC+3j$L6L`zfnn40 z#Xuz{a2x&IEx@#ffiQy;2Mfq#6it>=91Qy|{(u|Kgse%}K!HIQsOj>LKW0uG-={6Q z-EKVnvmsoQqy#IfMubh@8TS3)Gy`g$wt7#w@$`=6454}-8MfZ~0@k#B_wTbnmt>)6 zM79Z8)6AuJ85A`n;F^3598RHxDo7K$O)yRC5B@p352z_k>Gdg5Jw1p9P&|Tgh`HFA ze?Kn#pH^-1|Mg1M|1Ew@|Cg3Y{RfGw>kFA}*m0ZzgkkDonxtSFK^R>VOffQs`B54k zT;JX>R4v#Ab{^3ASvM}cJ%umjD1nGDd$+Sle#WT@Sz{>>PXOZkK>Td=iI?{YrBz09 d6FESD0RTof%OKnFqRjvR002ovPDHLkV1mYGxds3L literal 0 HcmV?d00001 diff --git a/platform/icons/src/toolbarDecorator/mac/add.png b/platform/icons/src/toolbarDecorator/mac/add.png new file mode 100644 index 0000000000000000000000000000000000000000..55f7db18f50dc79c9cc4a13dc2562ceb518236a7 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa&H|6fVg?3oVGw3ym^DWND5#L^ z5#-CjP^HSi(9q1l@bf>Ae#yX4YQVtoDuIE)Y6b&?c>bjLqi#U8k)AG&Ar-f_O!DSp zFywGPd*SrcBXZ~0wHWjSrOcYD(0_zq>5y7g&I%zFNtM$UtFss~WRE|naC;KAyE5cm zU%gD~?8r3cM`6uXe5|5YeZSiJ4(PAwt$G{&o#FciWkH^E>#c#7FnGH9xvXQYfv^(a`G_lW<5A5yos=kGu1 zav)*GvIvcOd4c;3hBG>@Y>`-Xl2h%Z%c5nqKTIB7W?7WFAydWea&SqnOLmhxyGVnH zA=Aftr&$wBKPh!C%szIZWz9r>Uzuf+tJP9^n*yXP|319ZvgV_az-#7@>}jCO7(8A5T-G@yGywqH7+5O+ literal 0 HcmV?d00001 diff --git a/platform/icons/src/toolbarDecorator/mac/moveDown.png b/platform/icons/src/toolbarDecorator/mac/moveDown.png new file mode 100644 index 0000000000000000000000000000000000000000..e674a16f697072b24ea99d2fddf56dae19c49d7a GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh0wlLOK8*rWoCO|{#S9GG!XV7ZFl&wkP*5S+ zBgmJ5p-Pp3p`n?9;pcxK{gQ#9)PRBERRRNp)eHs(@%%~gN8NyGJv?0;Ln>|^x!}mf zpvcks@c+>mJ^nXe=eQoV2t4f}t|Y%=MS^^*@{b1H>$?_g*|f;6EN%MJxie$i{_{)y l5fsqOW-%+owhEOxf1w3qP-GOE@c)I$ztaD0e0sv5_I}QK< literal 0 HcmV?d00001 diff --git a/platform/icons/src/toolbarDecorator/mac/moveUp.png b/platform/icons/src/toolbarDecorator/mac/moveUp.png new file mode 100644 index 0000000000000000000000000000000000000000..9d03ded568037b771667f391fdc9460770caef43 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh0wlLOK8*rWoCO|{#S9GG!XV7ZFl&wkP*5S+ zBgmJ5p-Pp3p`n?9;pcxK{gQ#9)PRBERRRNp)eHs(@%%~gN8NyG9X(wfLn>|^xnRi0 zpuoX=;Lzt^3H!p?eOMMR-pI{4UC;EP-0|uq4D%*3t7R1{&cQOQUGWegQu&X%Q~loCIBF%H30ws literal 0 HcmV?d00001 diff --git a/platform/icons/src/toolbarDecorator/mac/remove.png b/platform/icons/src/toolbarDecorator/mac/remove.png new file mode 100644 index 0000000000000000000000000000000000000000..62159bb959fe123aa5816639bec766627c74bf73 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa&H|6fVg?3oVGw3ym^DWND5#L^ z5#-CjP^HSi(9q1l@bf>Ae#yX4YQVtoDuIE)Y6b&?c>bjLqi#U8hMq2tAr-fh{`~)M z&urPy+2~^+WU}di#JqX)Tv*?KdwW|_bJN5^6S>R(|1&d)yxbP0l+XkKq4h4+ literal 0 HcmV?d00001 diff --git a/platform/icons/src/toolbarDecorator/moveDown.png b/platform/icons/src/toolbarDecorator/moveDown.png new file mode 100644 index 0000000000000000000000000000000000000000..b0782ac407ad28677e7852471ef17d95bb410a46 GIT binary patch literal 568 zcmV-80>}M{P)ovH{{Q=r_4ki=RfpF0PefM(5I_td8_}_4aMjZ(=YIVM zVdvPk@7UA;1P~K88+mzng}Ax?G90?`hXI#Y00IcB#=rj%ivRt??ni(C!m9BfvPK*> z0t65^a2Ty8_-e4;mMuvVl}^xRjmXF zAg}^~zfaVZG+mU7%e*+g{efsW_w+Y|y7+$vqqKCE=fD56Jh}guVej_yvO-su*aM|k z0t67)sq#E;7kzwv>D{u8Zy30MM&17WkAaPyk%5_ok>UKizYN!3FfklC|CQn2$AkYQ z_Z5Ju*M5}=D+^(?t#^lE9>8aH0uj8F|e~SF|e^QGQ9rD%y8k%XNErymi_qk z@tzM*?In;NfB=FA4p89bi+g7s@10-$0jybwiQ)Y}R)#BQzB4dBTL0_+k7r&$HTz)d z0Ro5-J)R6)5_NdRw2!GF5Kmak}(4^1CuX2l1So55@Z>||OH2?v`ghi7fubB2> zJ^KV+Zk=3C4pH617Jm8G=;{ChhzU)Tfsm~JK6Q&o-Y9<&1|w%?23D;EHg*y1eO5sw z`p9Yl0*DDolemPE@g60^Pyvvpi|_w22s8g-(9rwGz^WF@#>gRc0;t9arXC=Gn4p?O zd4v>>$>;oeHXUKm)#f{P5%*i^4&W9)JL10L3FZc8qTQKL5t||6$9% z{kMy3`HoEuKmcKlMq z0I^^by!H6=EUxW+h5!HlWBvW(T@^Mp00G2^E0Gfd009O7YqFy{w`HFT00000NkvXX Hu0mjf+NRk5 literal 0 HcmV?d00001 diff --git a/platform/icons/src/toolbarDecorator/remove.png b/platform/icons/src/toolbarDecorator/remove.png new file mode 100644 index 0000000000000000000000000000000000000000..ee2676e27ebf0823ecb1793de7bcd42b110f42d1 GIT binary patch literal 585 zcmV-P0=E5$P)?2|NX`A|Nk!rhQC1e|35&nzhH4mlc*!E zPWHASJpcg&*7*P7VVm&CI0gn@DF%iguNfG=KWAWIdJCk12K@QN!0_`0!{5)(7#41s zVZ-2L54I5?fFK%ykbz5>f#LT@pvG4W|9-q=VEX$RX!BPF#y=l`3cfKgvM@9J`}YU# zRDb{iYXk}W|M3Q>2&nPrbB6!FfVTbr&A|BUAz0Brpp*an_y%?|3;+ZW3q!KwM*UxZTu0tn*A|3D}F`NF`&4D|fN*$ltG zePHIu>b@R#Hm0h{CfYGftiB?90)K?-#)%&`2Fi2!|$)37`}sT6oP962q3UVE}ifr zTaL}M`STZ literal 0 HcmV?d00001 diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java index e346f4a120ea..2810d5a32a68 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * 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. @@ -181,7 +181,7 @@ public class FavoritesTreeViewPanel extends JPanel implements DataProvider { .disableUpAction() .addExtraAction(new DeleteFromFavoritesAction() { { - getTemplatePresentation().setIcon(IconUtil.getRemoveRowIcon()); + getTemplatePresentation().setIcon(IconUtil.getRemoveIcon()); } @Override diff --git a/platform/platform-api/src/com/intellij/ui/CommonActionsPanel.java b/platform/platform-api/src/com/intellij/ui/CommonActionsPanel.java index 90ad2778d913..ba0ff5eef1d3 100644 --- a/platform/platform-api/src/com/intellij/ui/CommonActionsPanel.java +++ b/platform/platform-api/src/com/intellij/ui/CommonActionsPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * 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. @@ -38,11 +38,11 @@ public class CommonActionsPanel extends JPanel { Icon getIcon() { switch (this) { - case ADD: return IconUtil.getAddRowIcon(); + case ADD: return IconUtil.getAddIcon(); case EDIT: return IconUtil.getEditIcon(); - case REMOVE: return IconUtil.getRemoveRowIcon(); - case UP: return IconUtil.getMoveRowUpIcon(); - case DOWN: return IconUtil.getMoveRowDownIcon(); + case REMOVE: return IconUtil.getRemoveIcon(); + case UP: return IconUtil.getMoveUpIcon(); + case DOWN: return IconUtil.getMoveDownIcon(); } return null; } diff --git a/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java b/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java index 150f7bfaef26..7c06e6c39075 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java +++ b/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * 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. @@ -202,7 +202,7 @@ public abstract class ValidatingTableEditor implements ComponentWithEmptyT }); - myRemoveButton = new AnActionButton(ApplicationBundle.message("button.remove"), IconUtil.getRemoveRowIcon()) { + myRemoveButton = new AnActionButton(ApplicationBundle.message("button.remove"), IconUtil.getRemoveIcon()) { @Override public void actionPerformed(AnActionEvent e) { removeSelected(); diff --git a/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java b/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java index 376a1c31d777..7ca98102182b 100644 --- a/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java +++ b/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * 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. @@ -477,7 +477,7 @@ public abstract class AndroidLogcatToolWindowView implements Disposable { private class MyAddFilterAction extends AnAction { private MyAddFilterAction() { - super(CommonBundle.message("button.add"), AndroidBundle.message("android.logcat.add.logcat.filter.button"), IconUtil.getAddRowIcon()); + super(CommonBundle.message("button.add"), AndroidBundle.message("android.logcat.add.logcat.filter.button"), IconUtil.getAddIcon()); } @Override @@ -503,7 +503,7 @@ public abstract class AndroidLogcatToolWindowView implements Disposable { private class MyRemoveFilterAction extends AnAction { private MyRemoveFilterAction() { super(CommonBundle.message("button.delete"), AndroidBundle.message("android.logcat.remove.logcat.filter.button"), - IconUtil.getRemoveRowIcon()); + IconUtil.getRemoveIcon()); } @Override diff --git a/plugins/android/src/org/jetbrains/android/uipreview/LayoutDeviceConfigurationsDialog.java b/plugins/android/src/org/jetbrains/android/uipreview/LayoutDeviceConfigurationsDialog.java index eb15f0aa6630..55f07edac269 100644 --- a/plugins/android/src/org/jetbrains/android/uipreview/LayoutDeviceConfigurationsDialog.java +++ b/plugins/android/src/org/jetbrains/android/uipreview/LayoutDeviceConfigurationsDialog.java @@ -1,3 +1,18 @@ +/* + * 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. + */ package org.jetbrains.android.uipreview; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -72,7 +87,7 @@ public class LayoutDeviceConfigurationsDialog extends DialogWrapper { AnActionButton addButton = new AnActionButton(AndroidBundle.message("android.layout.preview.device.configurations.dialog.add.button"), null, - IconUtil.getAddRowIcon()) { + IconUtil.getAddIcon()) { @Override public void actionPerformed(AnActionEvent e) { doAdd(); @@ -90,7 +105,7 @@ public class LayoutDeviceConfigurationsDialog extends DialogWrapper { myEditButton.setShortcut(CustomShortcutSet.fromString("alt E")); myRemoveButton = new AnActionButton(AndroidBundle.message("android.layout.preview.device.configurations.dialog.remove.button"), null, - IconUtil.getRemoveRowIcon()) { + IconUtil.getRemoveIcon()) { @Override public void actionPerformed(AnActionEvent e) { doRemove();