IDEA-75403 "Open in browser" action should have a GitHub icon, not a Git one

This commit is contained in:
oleg
2011-11-07 16:32:32 +04:00
parent 69e6fc3cc0
commit b6d5cf7a6c
8 changed files with 12 additions and 10 deletions
+2
View File
@@ -4,6 +4,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -16,6 +17,7 @@
<orderEntry type="module" module-name="lang-api" />
<orderEntry type="module" module-name="platform-impl" />
<orderEntry type="module" module-name="lang-impl" />
<orderEntry type="module" module-name="util" />
</component>
</module>
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

@@ -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
@@ -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
@@ -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) {
@@ -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) {
@@ -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();
@@ -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() {