From b6d5cf7a6c2d631e33b084d757a13247cdc4e535 Mon Sep 17 00:00:00 2001 From: oleg Date: Mon, 7 Nov 2011 16:15:39 +0400 Subject: [PATCH] IDEA-75403 "Open in browser" action should have a GitHub icon, not a Git one --- plugins/github/github.iml | 2 ++ .../org/jetbrains/plugins/github/github_icon.png | Bin 0 -> 1341 bytes .../plugins/github/GithubCreateGistAction.java | 3 +-- .../github/GithubOpenInBrowserAction.java | 3 +-- .../plugins/github/GithubRebaseAction.java | 3 +-- .../plugins/github/GithubShareAction.java | 3 +-- .../org/jetbrains/plugins/github/GithubUtil.java | 4 ++++ .../github/ui/GitHubSettingsConfigurable.java | 4 ++-- 8 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 plugins/github/resources/org/jetbrains/plugins/github/github_icon.png diff --git a/plugins/github/github.iml b/plugins/github/github.iml index 435080cfd90a..f9bf2af0bc3f 100644 --- a/plugins/github/github.iml +++ b/plugins/github/github.iml @@ -4,6 +4,7 @@ + @@ -16,6 +17,7 @@ + diff --git a/plugins/github/resources/org/jetbrains/plugins/github/github_icon.png b/plugins/github/resources/org/jetbrains/plugins/github/github_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6e0c459fe429a88163fbe91b1a371452039d02cf GIT binary patch literal 1341 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nA0*tB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPA){ffi_eM3D1{oGuTzrd=COM+4n&cLd=IHa;5RX-@T zIKQ+g85kdF$}r8qu)}W=NFmTQR{lkqz(`5Vami0E%}vcK@pQ3O0?O#6WTsfT7&#jn zxw$zRI2sw4Sr{5xI2)Q+xSAQ88(SJXnj0Iy%)qAC#Mscu#ni~e$imgo(9qSu(a{KK zkhz(Yshgv-qoWf{uV-FyNn&1dD$L$YpuJGN#(4EwITxiSmgEggW zO(7@D^ns4i2PF=q!~zonra%xAp7ennc;-pX1Ll|_VAj}iCi)5k17ohIi(^Q|ttpcX zPd5dKw5?U(XyI>KwqT_$iy}wMwQCLnP0OzRbID#kyIX+6DcJsiX-2U~Q=37NCWrd$ zL+@YiPK?sKFZtx&cboTnpUdQ{`UbC*Sbq6s)!t1RTchUsJy+IVy0aiQJT&yk{QU_B z#SG8y;qja#(WZEMQ|7GSf8#pZ4>#&6X*M)DUjO>AV8_jzhELC16JJ!yX*O(c^uGPJ zOy>CJn>|Jz-+$M-2L9L-t0T4~!|lp9lYkYuw{@0XUin3|V+q57d2OG6#;m`t`LSr{ zl`PYhI!y||qGX+1zx%pu6RAKETe<$A!*9!&fnsS{+iySZ337gzpQ0K#|FOmW(6i5r z4a);BZO&xd6t&hP!68a-I@4SqwcBsQe1sX^*oNt)mMy-RVI#-S#+-P;#P`DdWYq@} z_Q&6sS^t}8(4j2o$;k2P>X)j$d1kZs#-0EEcTMl_zj={jO6vs{Jo$K$dHFNzwC)+{ gTK{YB?Pua)IM?g_m}hrL1E@grboFyt=akR{0G&G7RR910 literal 0 HcmV?d00001 diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java index b914554ad992..2bcd95f7a554 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java @@ -43,11 +43,10 @@ import java.util.regex.Pattern; * @date 9/27/11 */ public class GithubCreateGistAction extends DumbAwareAction { - public static final Icon ICON = IconLoader.getIcon("/icons/github.png"); private static final Logger LOG = Logger.getInstance(GithubCreateGistAction.class); protected GithubCreateGistAction() { - super("Create Gist...", "Create github gist", ICON); + super("Create Gist...", "Create github gist", GithubUtil.GITHUB_ICON); } @Override diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java index 604e9eb7cc06..02f101be1f31 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java @@ -41,12 +41,11 @@ import javax.swing.*; * @date 12/10/10 */ public class GithubOpenInBrowserAction extends DumbAwareAction { - public static final Icon ICON = IconLoader.getIcon("/icons/github.png"); public static final String CANNOT_OPEN_IN_BROWSER = "Cannot open in browser"; private static final Logger LOG = Logger.getInstance(GithubOpenInBrowserAction.class.getName()); protected GithubOpenInBrowserAction() { - super("Open in browser", "Open corresponding GitHub link in browser", ICON); + super("Open in browser", "Open corresponding GitHub link in browser", GithubUtil.GITHUB_ICON); } @Override diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubRebaseAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubRebaseAction.java index 910079479ff0..9a18c5e636f0 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubRebaseAction.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubRebaseAction.java @@ -46,12 +46,11 @@ import javax.swing.*; * @date 12/8/10 */ public class GithubRebaseAction extends DumbAwareAction { - public static final Icon ICON = IconLoader.getIcon("/icons/github.png"); private static final Logger LOG = Logger.getInstance(GithubRebaseAction.class.getName()); private static final String CANNOT_PERFORM_GITHUB_REBASE = "Cannot perform github rebase"; public GithubRebaseAction() { - super("Rebase my GitHub fork", "Rebase your GitHub forked repository relative to the origin", ICON); + super("Rebase my GitHub fork", "Rebase your GitHub forked repository relative to the origin", GithubUtil.GITHUB_ICON); } public void update(AnActionEvent e) { diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java index 9ffdc2bdf642..3134de7f1fb7 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java @@ -46,11 +46,10 @@ import java.util.List; * @author oleg */ public class GithubShareAction extends DumbAwareAction { - public static final Icon ICON = IconLoader.getIcon("/icons/github.png"); private static final Logger LOG = Logger.getInstance(GithubShareAction.class.getName()); public GithubShareAction() { - super("Share project on GitHub", "Easily share project on GitHub", ICON); + super("Share project on GitHub", "Easily share project on GitHub", GithubUtil.GITHUB_ICON); } public void update(AnActionEvent e) { diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java b/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java index c75af97136a2..b9cf47431b05 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java @@ -22,6 +22,7 @@ import com.intellij.openapi.progress.Task; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Computable; +import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.net.HttpConfigurable; @@ -42,6 +43,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.github.ui.GithubLoginDialog; +import javax.swing.*; import java.io.InputStream; import java.util.ArrayList; import java.util.Collections; @@ -53,6 +55,8 @@ import java.util.List; public class GithubUtil { private static final String API_URL = "/api/v2/xml"; private static final Logger LOG = Logger.getInstance(GithubUtil.class.getName()); + public static final Icon GITHUB_ICON = IconLoader.getIcon("/org/jetbrains/plugins/github/github_icon.png"); + public static String getHttpsUrl() { return "https://" + GithubSettings.getInstance().getHost(); diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java index 3b22418f2818..b5dfe06f98a9 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java +++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java @@ -6,6 +6,7 @@ import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.github.GithubSettings; +import org.jetbrains.plugins.github.GithubUtil; import javax.swing.*; @@ -13,7 +14,6 @@ import javax.swing.*; * @author oleg */ public class GitHubSettingsConfigurable implements SearchableConfigurable { - public static final Icon ICON = IconLoader.getIcon("/icons/github.png"); private GithubSettingsPanel mySettingsPane; private final GithubSettings mySettings; @@ -26,7 +26,7 @@ public class GitHubSettingsConfigurable implements SearchableConfigurable { } public Icon getIcon() { - return ICON; + return GithubUtil.GITHUB_ICON; } public String getHelpTopic() {