MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-191307 icons: remove usages of deprecated 'github' icons

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-07-08 13:02:00 +03:00
parent 480084594d
commit 07097e9888
7 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java
View File

@@ -15,6 +15,7 @@
*/
package org.jetbrains.plugins.github;
import com.intellij.icons.AllIcons;
import com.intellij.ide.BrowserUtil;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -32,7 +33,6 @@ import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vfs.VirtualFile;
import icons.GithubIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.github.api.GithubApiTaskExecutor;
@@ -60,7 +60,7 @@ public class GithubCreateGistAction extends DumbAwareAction {
private static final String FAILED_TO_CREATE_GIST = "Can't create Gist";
protected GithubCreateGistAction() {
super("Create Gist...", "Create GitHub Gist", GithubIcons.Github_icon);
super("Create Gist...", "Create GitHub Gist", AllIcons.Vcs.Vendors.Github);
}
@Override

4
plugins/github/src/org/jetbrains/plugins/github/GithubCreatePullRequestAction.java
View File

@@ -15,13 +15,13 @@
*/
package org.jetbrains.plugins.github;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vfs.VirtualFile;
import git4idea.DialogManager;
import git4idea.repo.GitRemote;
import git4idea.repo.GitRepository;
import icons.GithubIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.github.api.GithubServerPath;
@@ -33,7 +33,7 @@ import org.jetbrains.plugins.github.ui.GithubCreatePullRequestDialog;
*/
public class GithubCreatePullRequestAction extends LegacySingleAccountActionGroup {
public GithubCreatePullRequestAction() {
super("Create Pull Request", "Create pull request from current branch", GithubIcons.Github_icon);
super("Create Pull Request", "Create pull request from current branch", AllIcons.Vcs.Vendors.Github);
}
@Override

4
plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserActionGroup.kt
View File

@@ -1,6 +1,7 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.plugins.github
import com.intellij.icons.AllIcons
import com.intellij.ide.BrowserUtil
import com.intellij.openapi.actionSystem.*
import com.intellij.openapi.components.service
@@ -25,14 +26,13 @@ import git4idea.GitFileRevision
import git4idea.GitRevisionNumber
import git4idea.GitUtil
import git4idea.history.GitHistoryUtils
import icons.GithubIcons
import org.jetbrains.plugins.github.api.GithubRepositoryPath
import org.jetbrains.plugins.github.util.GithubGitHelper
import org.jetbrains.plugins.github.util.GithubNotifications
import org.jetbrains.plugins.github.util.GithubUtil
open class GithubOpenInBrowserActionGroup
: ActionGroup("Open on GitHub", "Open corresponding link in browser", GithubIcons.Github_icon) {
: ActionGroup("Open on GitHub", "Open corresponding link in browser", AllIcons.Vcs.Vendors.Github) {
override fun update(e: AnActionEvent?) {
if (e == null) return

4
plugins/github/src/org/jetbrains/plugins/github/GithubRebaseAction.java
View File

@@ -2,6 +2,7 @@
package org.jetbrains.plugins.github;
import com.intellij.dvcs.DvcsUtil;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.application.AccessToken;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProgressIndicator;
@@ -23,7 +24,6 @@ import git4idea.update.GitFetchResult;
import git4idea.update.GitFetcher;
import git4idea.update.GitUpdateResult;
import git4idea.util.GitPreservingProcess;
import icons.GithubIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.github.api.GithubApiTaskExecutor;
@@ -48,7 +48,7 @@ public class GithubRebaseAction extends LegacySingleAccountActionGroup {
private static final String CANNOT_PERFORM_GITHUB_REBASE = "Can't perform GitHub rebase";
public GithubRebaseAction() {
super("Rebase my GitHub fork", "Rebase your GitHub forked repository relative to the origin", GithubIcons.Github_icon);
super("Rebase my GitHub fork", "Rebase your GitHub forked repository relative to the origin", AllIcons.Vcs.Vendors.Github);
}
@Override

3
plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.kt
View File

@@ -57,7 +57,6 @@ import git4idea.commands.GitLineHandler
import git4idea.i18n.GitBundle
import git4idea.repo.GitRepository
import git4idea.util.GitFileUtils
import icons.GithubIcons
import org.jetbrains.annotations.NonNls
import org.jetbrains.annotations.TestOnly
import org.jetbrains.plugins.github.api.GithubApiTaskExecutor
@@ -82,7 +81,7 @@ import javax.swing.JComponent
import javax.swing.JLabel
import javax.swing.JPanel
class GithubShareAction : DumbAwareAction("Share Project on GitHub", "Easily share project on GitHub", GithubIcons.Github_icon) {
class GithubShareAction : DumbAwareAction("Share Project on GitHub", "Easily share project on GitHub", AllIcons.Vcs.Vendors.Github) {
override fun update(e: AnActionEvent) {
val project = e.getData(CommonDataKeys.PROJECT)
e.presentation.isEnabledAndVisible = project != null && !project.isDefault

4
plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepository.java
View File

@@ -15,6 +15,7 @@
*/
package org.jetbrains.plugins.github.tasks;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.util.Comparing;
@@ -26,7 +27,6 @@ import com.intellij.tasks.impl.BaseRepositoryImpl;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.xmlb.annotations.Tag;
import com.intellij.util.xmlb.annotations.Transient;
import icons.TasksCoreIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.github.api.GithubApiUtil;
@@ -211,7 +211,7 @@ public class GithubRepository extends BaseRepositoryImpl {
@NotNull
@Override
public Icon getIcon() {
return TasksCoreIcons.Github;
return AllIcons.Vcs.Vendors.Github;
}
@NotNull

4
plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepositoryType.java
View File

@@ -1,12 +1,12 @@
package org.jetbrains.plugins.github.tasks;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.project.Project;
import com.intellij.tasks.TaskRepository;
import com.intellij.tasks.TaskState;
import com.intellij.tasks.config.TaskRepositoryEditor;
import com.intellij.tasks.impl.BaseRepositoryType;
import com.intellij.util.Consumer;
import icons.TasksCoreIcons;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -26,7 +26,7 @@ public class GithubRepositoryType extends BaseRepositoryType<GithubRepository> {
@NotNull
@Override
public Icon getIcon() {
return TasksCoreIcons.Github;
return AllIcons.Vcs.Vendors.Github;
}
@NotNull